Commit Graph

292 Commits

Author SHA1 Message Date
Billy O'Neal
97e7ac8d74
[vcpkg] Repair msbuild damage and workaround the way we integrate on VS2015. (#19767)
* Repair msbuild damage and workaround the way we integrate on VS2015.

This is a fix for a pile of issues discovered by https://github.com/microsoft/vcpkg/pull/18906

* VS 2015 has a bug that the <VcpkgInstalledDir Condition="!$(VcpkgInstalledDir.EndsWith('\'))">$(VcpkgInstalledDir)\</VcpkgInstalledDir> dance we do to get a trailing slash is not applied correctly when VcpkgInstalledDir was edited in the same property group attempting to add the trailing slash.
* We need a trailing slash on VcpkgInstalledDir at all times, but https://github.com/microsoft/vcpkg/pull/16173 damaged this by removing it from TreatAsLocalProperty. Add the right TreatAsLocalPropertys back. Add all such slash defenses to the top of the file just beneath, eliminating need to call Path::Combine and friends by following msbuild "directory properties have a trailing slash" convention.
* Move VcpkgOSTarget and VcpkgPlatformTarget into the .targets, as they aren't intended to be overridable by users and don't appear in our selection dialog box(es).
* Don't bother avoiding setting vcpkg properties when VcpkgEnabled is off; after all, VcpkgEnabled is itself a vcpkg property :). I left attempts to skip creating items since creating items can hit the disk.
* Add _Z to several internal msbuild variables.
* Move VcpkgApplocalDeps to the .props since it's a user setting.
* Don't unconditionally use $(TLogLocation) because it is not set on 2015, and also it's per-project.
* Fixed typo in docs "VcpkgInstalledDirectory", and document the limitation that it doesn't work in 2015.
* In manifest mode, put the installed tree in a subdirectory including the triplet to make changing configurations faster.

Known limitations:

* If you change vcpkg.json without changing any .cpp files, we don't rebuild the dependencies even though we should. I don't know how to fix this but it doesn't appear to be a regression.

* Fix .tlog handling.

* Further defend against modified properties on VS2015.

* Document more VS2015 limitations.

* Remove TreatAsLocalProperty comment.
2021-09-02 12:33:21 -07:00
autoantwort
2777eada3f
[docs] improve integrate documentation (#19700)
* [docs] improve integrate documentation

* Small suggestions

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-08-30 17:11:16 -07:00
autoantwort
642666976a
Document VCPKG_TARGET_IS_MINGW (#19790) 2021-08-30 10:18:49 -07:00
Kevin Lalumiere
c13c218522
[vcpkg] Add triplet option VCPKG_NO_COMPILER_TRACKING (#17526) 2021-08-25 20:36:28 -07:00
autoantwort
6b24f0fa76
[docs] Improve assetcaching.md (#19625)
* Improve asset caching readme

* Update assetcaching.md

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-08-17 17:33:44 -07:00
nicole mazzuca
99e06a64ec
[rollup:2021-08-09] Rollup PR (#19469)
* [rollup:2021-08-09] PR #16706 (@JackBoosY)

[vcpkg_fixup_cmake_targets] Fix up OSX system development path

* [rollup:2021-08-09] PR #19238 (@strega-nil)

[scripts-audit] vcpkg_download_distfile

* [rollup:2021-08-09] PR #19239 (@strega-nil)

[scripts-audit] vcpkg_find_fortran

* [rollup:2021-08-09] PR #19338 (@strega-nil)

[tinyfiledialogs] Fix for good

* [rollup:2021-08-09] PR #19348 (@strega-nil)

[scripts-audit] vcpkg_fixup_pkgconfig

* fix ports.cmake with newer vcpkg_download_distfile

* fix vcpkg create

* move vcpkg_common_definitions down so that it's not incorrect

* fix vcpkg_internal_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-16 13:42:31 -07:00
Billy O'Neal
5fd29d9350
Fix title capitalization from https://github.com/vcpkg/vcpkg.github.io/pull/54 (#19345) 2021-08-03 13:56:45 -07:00
Jack·Boos·Yu
b7f99c3c4b
[vcpkg-cmake] Fix docs and usage of option MAYBE_UNUSED_VARIABLES (#19245)
* Remove unused cmake options and MAYBE_UNUSED_VARIABLES values

* Update MAYBE_UNUSED_VARIABLES docs

* update version

* version stuff

* version stuff

* update docs
2021-08-03 10:42:34 -07:00
nicole mazzuca
5304f826b5
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)

[scripts-audit] vcpkg_copy_tools and friends

* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)

[vcpkg] Fix toolchain compatibility with cmake < 3.15

* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)

[cmake-guidelines] Minor update, for `if()`

* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)

[scripts-audit] vcpkg_check_linkage

* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)

[vcpkg.cmake] Fix variable case.

* [rollup:2021-07-26 6/6] PR #18839

[scripts-audit] z_vcpkg_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-07-29 09:47:35 -07:00
Eric Kilmer
f7c83acf48
[docs] Describe nugettimeout option in binarycaching (#19084) 2021-07-23 13:35:23 -07:00
Victor Romero
3c82e1931e
[docs] More Getting Started fixes (#18970)
* Use valid commmit ID for baseline

* More doc fixes
2021-07-20 16:24:38 -07:00
nicole mazzuca
0e1dc12185
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)

[vcpkg-cmake] Add check for unused cmake variables

* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)

[vcpkg_list] add new function

* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)

[scripts-audit] vcpkg_build_ninja

* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)

[scripts-audit] vcpkg_minimum_required

* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)

[scripts-audit] vcpkg_replace_string

* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)

[scripts-audit] windows scripts

* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)

[many ports] remove deprecated vcpkg_check_features call [1/5]

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-07-20 10:24:58 -07:00
Charles Ellis
bef043cfe1
CMake command docs say to use 0 for missing SHA512 (#18611) 2021-07-16 00:17:19 -07:00
Victor Romero
b15a9f3350
Use valid commmit ID for baseline (#18969) 2021-07-15 15:38:20 -07:00
nicole mazzuca
d369df7ecf
[rollup:2021-07-06] Rollup PR (#18838)
* [rollup:2021-07-06 1/8] PR #18272 (@strega-nil)

[scripts-audit] vcpkg_from_*

* [rollup:2021-07-06 2/8] PR #18319 (@strega-nil)

[scripts-audit] add guidelines for cmake

* [rollup 2021-07-06 3/8] PR #18410 (@mheyman)

[vcpkg-cmake-config] documentation fix

* [rollup:2021-07-06 4/8] PR #18488 (@strega-nil)

[scripts-audit] vcpkg_execute_*

* [rollup:2021-07-06 5/8] PR #18517 (@strega-nil)

[scripts-audit] vcpkg_extract_source_archive

* [rollup:2021-07-06 6/8] PR #18674 (@NancyLi1013)

[vcpkg doc] Update examples

* [rollup:2021-07-06 7/8] PR #18695 (@JackBoosY)

[vcpkg] Update the minimum version of vcpkg

* [rollup:2021-07-06 8/8] PR #18758 (@ras0219-msft)

[vcpkg_from_git] Fix error if downloads folder does not exist

* build docs!

* fix bond:*-windows

* fix nmap

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Michael Heyman <Michael.Heyman@jhuapl.edu>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
2021-07-14 12:45:18 -07:00
Julian Xhokaxhiu
ae5b1cf41b
[binarycaching.md] Improve Azure DevOps example (#18807)
Add a missing, but required task for Azure DevOps Pipelines, to automatically authenticate against the Artifacts registry.
This should help any vcpkg newcomer to integrate easily.
2021-07-06 13:37:15 -07:00
autoantwort
876e67c26e
[vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH (#17336)
* [vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH

* [vcpkg.cmake] make PREPEND optional (default off, option VCPKG_PREFER_VCPKG_LIBS)

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update scripts/buildsystems/vcpkg.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-23 15:30:46 -07:00
NancyLi1013
3910b29767
[vcpkg_download_distfile] Add condition for padding the SHA (#18459) 2021-06-15 10:14:40 -07:00
pastdue
38d2893b30
Add VCPKG_MAKE_CONFIGURE_OPTIONS (that can be set in the triplet) (#18132)
* Add VCPKG_MAKE_CONFIGURE_OPTIONS that can be set in the triplet

To append options to the configure command

* Add documentation

* Expand without quotes

Co-Authored-By: ras0219 <533828+ras0219@users.noreply.github.com>

* Add VCPKG_CMAKE_CONFIGURE_OPTIONS that can be set in the triplet

Co-Authored-By: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Bump vcpkg-cmake port-version

* Run x-add-version vcpkg-cmake

* Apply suggestions from code review

* [vcpkg-cmake] add version

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-08 09:50:09 -07:00
Matthias C. M. Troffaes
bec883fef4
[doc] document vcpkg_fixup_pkgconfig merging behaviour (#18091)
* [doc] document vcpkg_fixup_pkgconfig merging behaviour

* [doc] add source
2021-06-04 16:49:02 -07:00
Pratik Chowdhury
750c0bdc90
[docs] vcpkg_from_github beast moved to boost-beast (#18106) 2021-06-04 16:48:54 -07:00
ras0219
8c497bb647
[vcpkg] Add experimental $X_VCPKG_ASSET_SOURCES for source caching (#13639)
* [vcpkg] Add experimental $VCPKG_X_READWRITE_MIRROR_URL_TEMPLATE for source caching

* [vcpkg] Use prerelease version for testing

* [docs] Add assetcaching.md

* Revert bootstrap changes

* [vcpkg_download_distfile] Deprecate SILENT_EXIT

* cmake_parse_arguments() always defines option arguments

* Adjust CI baseline

* [vcpkg_download_distfile] Address CR comments, restore ARIA2

* [CI] Add source caching to Linux and OSX CI passes

* [ci.baseline.txt] Skip chartdir on more platforms
2021-06-04 16:48:26 -07:00
Mats Taraldsvik
9411ed741e
[docs] Updated list of off-by-default features (#18258) 2021-06-03 12:26:40 -07:00
Robert Schumacher
6fc4e607f1
[docs] Replace 'git-tree' in fs registry docs with 'path' (#17727) 2021-05-26 15:03:02 -07:00
Augustin Popa
ce6253b6f4
[Doc] Update binarycaching.md with clearer description (#18033)
* Update binarycaching.md with clearer description

We received user feedback about the binary caching feature not being clear. I rewrote some of the opening section to try to describe it better. Feedback is appreciated.

* Apply suggestions from code review

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-05-26 10:28:37 -07:00
nicole mazzuca
a3db16a447
[native supports-expr] docs changes (#16971) 2021-05-21 13:14:02 -07:00
ras0219
b39eb225c9
[docs] Add vcpkg.dev to community sites (#18031) 2021-05-21 00:35:53 -07:00
ras0219
3738723dd2
Update versioning.getting-started.md (#18000) 2021-05-18 23:15:29 -07:00
nicole mazzuca
253c561a2c
[scripts-audit] gn buildsystem (#17776)
* [scripts-audit] Remove vcpkg_build_gn

This command has never been used (git log -S"vcpkg_build_gn\("
gives no results outside of the file itself and docs)
and so shrink the public interface surface

* [scripts-audit] gn buildsystem

* format

* oops

* aaaugh

* cr
2021-05-17 11:08:33 -07:00
Kai Pastor
5a271a9290
[doc] Fix spelling errors (#17560)
* [doc] Fix spelling errors in docs

* [doc] Fix spelling errors in scripts

* Bump version

* x-add-version

* Fix another typo

* Rebuild
2021-05-09 10:48:42 -07:00
autoantwort
f44d4c169f
[docs] link to new functions in deprecated warnings (#17179)
* [docs] link to new functions in deprecated warnings

* [docs] add deprecation messages to portfile-functions.md

* [docs] also update documentation in .cmake files

* [docs] introduce new directive DEPRECATED BY in the documentation generation script and use that directive

* Trigger Build

* Trigger Build

* Trigger Build
2021-05-09 10:47:21 -07:00
nicole mazzuca
6e80675573
[docs registries] Add reference documentation (#17672)
* using registries reference documentation

* start work on "creating registries" document

also fix minor issue in "using registries" doc

* Robert's comments, continue working

* finish creating registries docs

* add links to example registries

* aupopa cr
2021-05-06 12:13:29 -07:00
Robert Schumacher
2924119c1e
[docs] Consolidate versioning documentation (#17580)
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
2021-05-03 09:43:34 -07:00
autoantwort
44d94c2edb
[docs] binarycaching.md: Move Configuration section to the top. Add table of… (#17060)
* binarycaching.md: Move Configuration section to the top. Add table of contents. Make clear that file location must be absolute. Add that read is the default mode.

* Apply suggestions from code review

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-04-30 12:40:18 -07:00
Mathis Logemann
4de6cd5ed8
[doc] Update manifest to reference versioning spec (#17549)
* Update manifest to reference versioning spec

Currently only `version-string` is included in the manifest-files.md. However there are more variants of this field. This PR adds a cross link to the versioning specification. 

fixes #17548

* move version field up

* list different version schemes

* remove comma

* Update docs/maintainers/manifest-files.md

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-04-29 13:48:55 -07:00
Phoebe
713e3aeb3f
[docs] Fix broken links (#17566)
* [docs] Fix broken links

* Fix the charactor

* Update the charactor
2021-04-29 13:39:50 -07:00
Kai Pastor
0731c19566
[doc] Add 2019.06 blog post (#17550) 2021-04-29 08:01:55 -07:00
Phoebe
b23a4a7516
[vcpkg docs] Add the procedure for updating vcpkg to faq (#17257)
* [vcpkg docs] Add the procedure for updating vcpkg to faq

* Address the review suggestions

* Update the changes
2021-04-28 18:50:17 -07:00
Qingnan Duan
5220830089
Remove a ')' character in the documentation (#16515)
* Remove extra )

* fix doc

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-04-28 18:03:43 -07:00
Kai Pastor
6240751612
[docs] Add mingw documentation (#17219)
* Add mingw documentation

* Minor edits

* Fix typos

* Revise comments about tools

* Make mingw-w64 explicit

* Fix another typo

* How to avoid mixing different installations

* Ban '/bin' from 'PATH', too

* Update mingw.md

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-28 14:49:21 -07:00
Kai Pastor
99a179d84d
Fix broken link (#17484) 2021-04-28 13:52:32 -07:00
tre
7fea4f15c4
fix example code. (#17502) 2021-04-28 13:14:27 -07:00
Kai Pastor
46de713371
[doc] Improve manifest documentation links (#17214)
* Improve manifest documentation links

* Update control-files.md

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-23 10:39:27 -07:00
autoantwort
1f571706f0
[control-files.md] fix dead link and add command how to convert files (#17439) 2021-04-23 10:32:37 -07:00
Ahmed Yarub Hani Al Nuaimi
fe25e8ede8
[aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (#15725)
* Fix Android build

* Add versioning support

* Disable building tests for cURL

* Fix patch file

* Fix patch file

* Fix patch file

* Fix versioning

* Fix patch file

* [aws-sdk-cpp] Update patch

* update baseline

* Fix dependencies

* Simplify Android configuration

* Simplify Android configuration

* Simplify Android configuration
Add alternative Git CMake script

* Bump port version

* Bump version files

* Remove redundant file

* Bump port version

* Fix version files

* Do not build curl, zlib and OpenSSL

* Typo de pkgconfig script

* Fix cURL build for Android

* Add required flags

* Revert macro change

* Fix curl build for other platforms

* Fix curl build for other platforms

* [vcpkg baseline][gsoap] Update to 2.8.111

* Update versions

* [ktx/otl] Update download hash

* update version record

* Fix curl build for other platforms

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Remove FingGit

* Fix configuration step

* Bump cURL port version

* Bump cURL port version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Update ports/curl/CONTROL

* Update ports/curl/portfile.cmake

* update baseline record

* Fix Git

* update version record

* Typo

* Fix cross-platform builds of OpenSSL on MinGW/Windows

* Update version

* Fix version

* update doc

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Add debug libraries to curl for Android
Simplify OpenSSL patch for curl
Update OpenSSL's port version

* Update aws-sdk-cpp, curl, and OpenSSL versions

* Fix libssh after latest update

* Update libssh version

* Update libssh version

* Update ports/libssh/portfile.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update ports/curl/portfile.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update ports/libssh/portfile.cmake

* Apply suggestions from code review

* Use correct variables for OpenSSL libraries when building curl for Android
Fix zlib building for Android
Remove redundant patch comments

* Bump zlib's port version

* Update zlib, libssh, and curl versions

* [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path

* update version record

* Update versions/o-/openssl.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-19 17:08:51 -07:00
autoantwort
d978e59bfb
add more blog posts (#17220) 2021-04-12 10:44:23 -07:00
autoantwort
580200d113
add link to common vcpkg definitions (#17066) 2021-04-07 12:52:48 -07:00
Alexander Neumann
1bb0fe61df
[vcpkg baseline][qt5-base] Fix glib link issues on linux (#16954)
* [qt5-base] fix glib link issues on linux

* add version

* remove unused vars

* update version

* write port info file.

* version stuff

* remove paraview from baseline. It was added due to the same spurious glib failures.

* trying out a different approach

* more changes

* change the if to actually use the buildtype instead

* remove x_vcpkg_get_port_info

* add option QT_OPENSSL_LINK back in

* use INCLUDE_DIRS_(DEBUG|RELEASE) instead of just INCLUDE_DIRS

* regen docs

* remove function call I forgot to remove

* [vcpkg-pkgconfig-get-modules] Move to port

* revert changes to ports.cmake

* include the file in qt5-base

* fix path

* remove unnecessary include

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Apply suggestions from code review

* update version

* ws removal

* version stuff

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-04-06 10:53:41 -07:00
Alexander Neumann
42c437bb33
[vcpkg/scripts] add variable VCPKG_CROSSCOMPILING (#16900)
* add VCPKG_CROSSCOMPILING

* update docs

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* update docs

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-04-02 12:51:05 -07:00
Alexander Neumann
2779b733c2
[vcpkg/scripts] add a way to define another tool destination (#16935) 2021-03-31 12:47:35 -07:00