Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glog]: update to v0.6.0 #25204

Closed
wants to merge 57 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
bf069e3
[glog]: update to v0.6.0
jiayuehua Jun 12, 2022
f5b6730
fix typo
jiayuehua Jun 13, 2022
6506e80
[cgal] Fix incorrect warning message (#24112)
JackBoosY Jun 13, 2022
73d50c1
[check] Fix the incorrect path of dll (#25211)
Cheney-W Jun 13, 2022
86aed64
[libpng] Fix `find_package` debug libraries (#25200)
dg0yt Jun 13, 2022
60993b8
[libiconv] Update to 1.17 (#25184)
dg0yt Jun 13, 2022
70cfcd0
[libspatialite] Fix build with VCPKG_BUILD_TYPE=release (#25180)
m-kuhn Jun 13, 2022
b9e42cd
[rtmidi] Add new 'alsa' feature (#25156)
gvnnz Jun 13, 2022
b88cd52
[pipewire] new port, version 0.3.52 (#25160)
abique Jun 13, 2022
ac7992c
[physx] Add support for Mac on ARM. (#25154)
Hoikas Jun 13, 2022
b03f150
Add entry for Python with venv support. (#25215)
BillyONeal Jun 14, 2022
bcf3392
[mqtt-cpp] Update to 13.0.0 (#25162)
dempo93 Jun 14, 2022
6dfade4
[plog] Update to 1.1.8 (#25166)
SergiusTheBest Jun 14, 2022
72fa4d4
Update vcpkg-unstable internal pipeline to MSVC-CI-PHASE5-YAML (#25219)
BillyONeal Jun 14, 2022
80bcf1e
fix cmake module path
jiayuehua Jun 14, 2022
52186bc
[llvm] updated to 14.0.4 + add spirv backend support (#25142)
Jun 14, 2022
e78aa84
[chartdir] use versioned download link (#23732)
cd-pkwan Jun 14, 2022
3cca353
[mmloader] Fix `supports` (#25232)
Thomas1664 Jun 14, 2022
8d2bff3
[webview2] New port of Microsoft.Web.WebView2 (#25217)
ras0219-msft Jun 14, 2022
06acb79
[docs] Add search.md (#24755)
ras0219-msft Jun 14, 2022
f3702ed
[crfft, constexpr] Fix copyright location (#25241)
Thomas1664 Jun 15, 2022
dae9883
[installerbase] update to 4.4.0 (#25223)
JonLiu1993 Jun 15, 2022
d4cd43e
[gmp | mpir] Add --with-pic (#25209)
lrineau Jun 15, 2022
9641449
[paho-mqtt] Update to 1.3.10 and fix include path (#25207)
LilyWangLL Jun 15, 2022
d25fb81
fix support (#25206)
Adela0814 Jun 15, 2022
ffa73a4
[zziplib] Export unofficial targets (#25205)
JackBoosY Jun 15, 2022
4e443a3
[quantlib] Fix `supports` (#25191)
Thomas1664 Jun 15, 2022
d2f3f30
[gdal] Fix building for 32bit Android and msvc with poppler (#25190)
m-kuhn Jun 15, 2022
0abb2b2
Update vcpkg-tool to 2022-06-15 (#25226)
BillyONeal Jun 15, 2022
aa01a5e
Added documentation for VCPKG_FORCE_DOWNLOADED_BINARIES env var (#24674)
christophe-calmejane Jun 15, 2022
86ff75c
[glog] fix not work on c++03 (#25155)
jiayuehua Jun 15, 2022
a175d0a
[openmvs, vcglib] Update openmvs 2.0.1, vcglib 2022.02 (#25135)
longhuan2018 Jun 15, 2022
86bf362
[qt5-tools] Fix deploying translation files with windeployqt (#25134)
MehdiChinoune Jun 15, 2022
3d054a1
[stduuid] Add new port @1.2.2 (#25115)
BurningEnlightenment Jun 15, 2022
a00906c
[libcaer] New port for libcaer (#25110)
jureviciusr Jun 15, 2022
ac6ef2f
[random123] Add new port (#24716)
KineticTheory Jun 15, 2022
3d8f781
[hdf5] Refix msmpi library path in pkgconfig (#25089)
JackBoosY Jun 15, 2022
0af508e
[cpuinfo] Always check for x86-ish with the same regex. (#25258)
BillyONeal Jun 16, 2022
dc74787
[proj] Update to 9.0.1 (#25257)
dg0yt Jun 16, 2022
f5a0eb2
[bshoshany-thread-pool] Updated to v3.0.0 (#25262)
bshoshany Jun 16, 2022
dc6f878
[buck-yeh-bux] Update to 1.6.6 (#25254)
buck-yeh Jun 16, 2022
6e16931
[wxwidgets] Remove debug asserts from Release build. (#25240)
AenBleidd Jun 16, 2022
842c728
[mygui] Add feature tools (#25228)
Cheney-W Jun 16, 2022
ca8bde3
[saucer, lockpp] add new port (#25111)
Curve Jun 16, 2022
91393fa
[ignition-cmake2/ignition-modularscripts/ignition-common3] Add option…
JackBoosY Jun 17, 2022
f2606af
[air-ctl] Update to v1.1.0 (#25290)
inie0722 Jun 17, 2022
945e171
[redis-plus-plus] Add feature async-std and fix dependency libuv (#25…
JackBoosY Jun 17, 2022
e1f3eec
[skia] Build configuration fix (#25247)
Chlumsky Jun 17, 2022
1f2d10b
[wtl] Add another post-release update (#25229)
chrullrich Jun 17, 2022
2bbb79d
[librabbitmq] Fix cannot include header file when using. (#25224)
FrankXie05 Jun 17, 2022
c266859
[python3] Update to 3.10.5. (#25105)
Hoikas Jun 17, 2022
895a82a
[gtk] Add a dependency on gettext[tools] to build translation files (…
mkhon Jun 17, 2022
9213696
[comms,commsdsl,comms-ublox] update ports (#24939)
mathisloge Jun 17, 2022
b49b2bd
[many ports] Remove from CI baseline (#25075)
Thomas1664 Jun 17, 2022
55f95e5
[glog]: update to v0.6.0
jiayuehua Jun 12, 2022
c08666c
make cplusplus macro work on msvc
jiayuehua Jun 18, 2022
2b985fb
Merge remote-tracking branch 'origin/glog0.6' into glog0.6
jiayuehua Jun 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions docs/commands/search.md
Original file line number Diff line number Diff line change
@@ -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
37 changes: 18 additions & 19 deletions docs/maintainers/internal/vcpkg_tool_release_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,37 @@ 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. 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`
3. Check that the changes there are in fact the changes that we want in that release. (Be aware,
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)
4. `git push https://devdiv.visualstudio.com/DevDiv/_git/vcpkg FETCH_HEAD:main`
5. Monitor the resulting signed build at:
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.)
6. The signed build will automatically create a draft GitHub release at
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/`.
7. Publish that draft release as "pre-release".
8. Smoke test the 'one liner' installer: (Where 2022-03-30 is replaced with the right release name)
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-03-30/vcpkg-init.ps1)`
`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-03-30/vcpkg-init.ps1 && .\vcpkg-init.cmd`
`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-03-30/vcpkg-init.sh -L)`
9. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1`
`. <(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)
10. 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 targeting branch
`refs/pull/ The PR number created in the previous step /head` (for example
`refs/pull/24131/head`
https://dev.azure.com/vcpkg/public/_build/results?buildId=70703&view=results)
11. (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.
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)
4 changes: 4 additions & 0 deletions docs/users/config-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ List paths to overlays using the platform dependent PATH separator (Windows `;`,

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
Expand Down
4 changes: 2 additions & 2 deletions ports/air-ctl/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO inie0722/CTL
REF 58ca0f229aff093ada66955993cada93e01da18c #1.0.0
SHA512 6e1fcd70be0750b3e45de80d6fb30471fdbd8bbd23afd7ff9fb8c3b9fe61669cd02773cf2b6573348dd2905a303845627d3f5f3e647f4e1261db4cc570cf5099
REF v1.1.0
SHA512 bf04841d90b39a6f607773c982aa9d4e2ef0aa6297810595391eb5bf01f698583518041fcee00bcde7cd8f5228bea637f7fe299c7f26c49bea16669044618424
HEAD_REF master
)

Expand Down
3 changes: 1 addition & 2 deletions ports/air-ctl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "air-ctl",
"version": "1.0.0",
"port-version": 1,
"version": "1.1.0",
"description": "C template container library",
"homepage": "https://github.com/inie0722/CTL",
"license": "BSL-1.0",
Expand Down
12 changes: 3 additions & 9 deletions ports/bshoshany-thread-pool/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
#header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO bshoshany/thread-pool
REF v2.0.0
SHA512 eac1674ea999d25d8d0b8f1b24714830330ba4d345e3f730e49359bae89d9259e429d48357a45f7b4355cbbe1a63f04e7fe2c4e0be08b3bbea51018c62721fcc
REF v3.0.0
SHA512 009c45bdca7555d7446add9bdfd1080d1af09071f94034933bf09629425b6945b708e41cd572b0eb270fd53a1e8a57eed606378d147c88e9f05eaf6fd89d88c9
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"

)
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)
9 changes: 6 additions & 3 deletions ports/bshoshany-thread-pool/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"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"
"version": "3.0.0",
"maintainers": "Barak Shoshany <baraksh@gmail.com>",
"description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library",
"homepage": "https://github.com/bshoshany/thread-pool",
"documentation": "https://github.com/bshoshany/thread-pool/blob/master/README.md",
"license": "MIT"
}
4 changes: 2 additions & 2 deletions ports/buck-yeh-bux/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO buck-yeh/bux
REF b125e31341660ea76ca51cc5013e52d8d34a1f27 # v1.6.5
SHA512 c37fea47076a192161aacacf8694c5b6d487a1c2ebe1fa06acdd9948e42e1b1440d83ebe38f4ae3b86c90cb1aba76f7254cd434ea85e24484a9dacb6944511a9
REF b046518dcffcdef9b8dbccd0accc2636df301766 # v1.6.6
SHA512 af1ca5c37623a09c64e1a84a630a26911be8c87eb007b112665b7c6080dfac67bd89eb36367202c5d29af97f4e549d6f27e41410220a57bd7756bdb1ecf8ddf0
HEAD_REF main
)

Expand Down
3 changes: 1 addition & 2 deletions ports/buck-yeh-bux/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "buck-yeh-bux",
"version": "1.6.5",
"port-version": 1,
"version": "1.6.6",
"description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.",
"homepage": "https://github.com/buck-yeh/bux",
"license": "MIT",
Expand Down
15 changes: 15 additions & 0 deletions ports/cgal/fix-incorrect-warning.patch
Original file line number Diff line number Diff line change
@@ -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()
35 changes: 22 additions & 13 deletions ports/cgal/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Header only
vcpkg_buildpath_length_warning(37)

vcpkg_from_github(
Expand All @@ -6,6 +7,7 @@ vcpkg_from_github(
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
Expand All @@ -18,7 +20,14 @@ vcpkg_cmake_configure(
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()
Expand All @@ -28,28 +37,28 @@ vcpkg_cmake_config_fixup()
vcpkg_copy_pdbs()

# Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
else()
foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin)
foreach(ROOT "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE
${ROOT}/cgal_create_CMakeLists
${ROOT}/cgal_create_cmake_script
${ROOT}/cgal_make_macosx_app
"${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(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}
"${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})
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
1 change: 1 addition & 0 deletions ports/cgal/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"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",
Expand Down
22 changes: 11 additions & 11 deletions ports/chartdir/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_LIBRARY_LINKAGE STREQUAL static)

set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
# 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()

elseif(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_IS_WINDOWS)

vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://www.advsofteng.net/chartdir_cpp_win.zip"
URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_win_7.0.0.zip"
FILENAME "chartdir_cpp_win-7.0.0.zip"
SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b
)
Expand All @@ -34,9 +34,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
elseif(VCPKG_TARGET_IS_OSX)

vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz"
URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_mac_7.0.0.tar.gz"
FILENAME "chartdir_cpp_mac-7.0.0.tar.gz"
SHA512 3f00a4eb7c6b7fc1ebd4856c287ca9a76ca4ce813b4203350526c7ef10c946baa3768446178b664af8e8222275f10f9ee6f5f87cf1e23f23c4a221f431864744
SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2
)

vcpkg_extract_source_archive_ex(
Expand All @@ -55,15 +55,15 @@ elseif(VCPKG_TARGET_IS_LINUX)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz"
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.net/chartdir_cpp_linux.tar.gz"
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
)
Expand Down
5 changes: 3 additions & 2 deletions ports/chartdir/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "chartdir",
"version": "7.0.0",
"port-version": 3,
"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/"
"homepage": "https://www.advsofteng.com/",
"supports": "!arm & !uwp"
}
8 changes: 3 additions & 5 deletions ports/check/fix-lib-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,15 @@ index 38cbc53..d8a4272 100644
# vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a02dbe..ade4cfd 100644
index 4a02dbe..3bf2fa6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -191,8 +191,8 @@ if(NOT THIS_IS_SUBPROJECT)
@@ -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}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/manual-link
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()
4 changes: 2 additions & 2 deletions ports/check/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "check",
"version": "0.15.2",
"port-version": 3,
"port-version": 4,
"description": "A unit testing framework for C",
"homepage": "https://github.com/libcheck/check",
"license": "LGPL-2.1",
"license": "LGPL-2.1-only",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion ports/clfft/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ endif()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
3 changes: 2 additions & 1 deletion ports/clfft/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "clfft",
"version": "2.12.2",
"port-version": 4,
"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",
{
Expand Down
5 changes: 5 additions & 0 deletions ports/comms-ublox/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The generated code has no license, the vendor is free to pick any as long as it's compatibile with the license(s) of the relevant CommsChampion Ecosystem project:

The protocol definition uses the COMMS Library, which is provided under the MPL-2.0 licence. It allows usage in any closed source projects as long as modifications to the COMMS Library itself remain open source.
The CommsChampion Tools use open source Qt5 libraries, hence are licensed under the GPLv3. It means that any relevant plugin code must remain open source and is not really available to be used in the closed source commercial products.
The code of this project (libraries and tools it contains) is licensed under Apache v2.0 license.
Loading