Commit Graph

150 Commits

Author SHA1 Message Date
nicole mazzuca
4902a7be1d
[vcpkg manifest-mode] Fix parallel msbuild failures ()
This changes the vcpkg msbuild targets file to wait for the lock, rather than failing immediately
2020-09-18 17:01:18 -07:00
Alexander Neumann
59115f6e3a
[vcpkg|toolchain] add VCPKG_OVERLAY_(PORTS|TRIPLETS) to the toolchain ()
* add VCPKG_OVERLAY_(PORTS|TRIPLETS) to the toolchain

* move everything into additional manifest params

* fix me not thinking
2020-09-11 10:57:47 -07:00
xyb
fdac1fc5aa
Add community triple arm64-linux and arm-linux. ()
Verify the following command on both 32 bits and 64 bits OS on Raspberry pi 3.

    ./bootstrap-vcpkg.sh
    ./vcpkg install boost
2020-09-05 10:45:48 -07:00
nicole mazzuca
619b294700
[vcpkg.cmake] error out if the mode has changed () 2020-09-03 09:58:15 -07:00
ras0219
e96e74f08b
[vcpkg] Hotfix regression in ()
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-08-22 22:12:51 -07:00
nicole mazzuca
b919cf7f7c
[vcpkg.cmake] check for vcpkg.json only in ${CMAKE_SOURCE_DIR} () 2020-08-22 02:04:16 -07:00
Phoebe
6659efca6a
[msbuild] Revert the importance to Normal () 2020-08-05 13:03:02 -07:00
nicole mazzuca
d6565e146c
[vcpkg manifest] add feature support () 2020-08-01 16:45:00 -07:00
Manuel Kugelmann
0e08105aa9
[vcpkg] Fix [boost] find_package for MSVC2013 / v120 ()
* Fix [boost] find_package for MSVC2013 / v120

added conditional set(Boost_COMPILER "-vc120") to vcpkg.cmake

* fixed spacing

* fixed spaces
2020-08-01 15:02:50 -07:00
Andrei Lebedev
077c0746be
[vcpkg] Add initial s390x support ()
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
2020-07-23 14:16:01 -07:00
nicole mazzuca
3871d73349
[vcpkg manifests] fix some issues ()
Fixes 
Fixes 
Fixes 
Fixes 
Fixes 
Fixes 
Fixes 
Fixes 
2020-07-09 12:32:31 -07:00
ras0219
fd4a08806f
[vcpkg] Fix MSBuild regressions and . ()
This PR also renames the VcpkgUserTriplet MSBuild variable to VcpkgTriplet to minimize user confusion compared to previous practice and documentation.

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-07-08 15:08:17 -07:00
Robert Schumacher
eedecc033d
[vcpkg.targets] Fix regression with MSBuild targets () 2020-07-08 13:51:03 -07:00
Silvio Traversaro
c916abaa0d
[vcpkg.cmake] Support toolchains that set CMAKE_FIND_ROOT_PATH_MODE_* variables to ONLY () 2020-07-07 15:01:01 -07:00
Dr. Frank Heimes
c21893b4dc
[vcpkg integrate] Clean up vcpkg.target file ()
Use IncludePath and LibraryPath propertiesThese tool agnostic properties allow to configure ClCompile and ResourceCompile without repeating the code.
This change includes my changes from .

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-07-05 12:39:14 -07:00
Phoebe
f24543e831
[msbuild] Revert the importance to Normal () 2020-07-02 20:19:23 -07:00
Stephane Lajoie
428df4c7d6
Don't change manifest root when manifest isn't enabled. ()
* Don't change manifest root when manifest isn't enabled.

* Update scripts/buildsystems/msbuild/vcpkg.targets

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2020-07-01 12:18:13 -07:00
nicole mazzuca
1d8f0acc9c
[vcpkg manifest] Manifest Implementation ()
==== Changes Related to manifests ====

* Add the `manifests` feature flag
  * This only says whether we look for a `vcpkg.json` in the cwd, not
    whether we support parsing manifests (for ports, for example)
* Changes to the manifests RFC
  * `"authors"` -> `"maintainers"`
  * `--x-classic-mode` -> `-manifests` \in `vcpkg_feature_flags`
  * reserve `"core"` in addition to `"default"`, since that's already
    reserved for features
  * Add a small helper note about what identifiers must look like
  * `<license-string>`: SPDX v3.8 -> v3.9
  * `"feature"."description"` is allowed to be an array of strings as well
  * `"version"` -> `"version-string"` for forward-compat with versions
    RFC
* Add the `--feature-flags` option
* Add the ability to turn off feature flags via passing
  `-<feature-flag>` to `VCPKG_FEATURE_FLAGS` or `--feature-flags`
* Add CMake toolchain support for manifests
  * Requires either:
    * a feature flag of `manifests` in either `Env{VCPKG_FEATURE_FLAGS}`
      or `VCPKG_FEATURE_FLAGS`
    * Passing the `VCPKG_ENABLE_MANIFESTS` option
  * The toolchain will install your packages to
    `${VCPKG_MANIFEST_DIR}/vcpkg_installed`.
* Add MSBuild `vcpkg integrate install` support for manifests
  * Requires `VcpkgEnableManifest` to be true
* `vcpkg create` creates a port that has a `vcpkg.json` instead of a
  `CONTROL`
* argparse, abseil, 3fd, and avisynthplus ports switched to manifest
  from CONTROL
* Add support for `--x-manifest-root`, as well as code for finding it if
  not passed
* Add support for parsing manifests!
* Add a filesystem lock!

==== Important Changes which are somewhat unrelated to manifests ====

* Rename `logicexpression.{h,cpp}` to `platform-expression.{h,cpp}`
* Add `PlatformExpression` type which takes the place of the old logic
  expression
  * Split the parsing of platform expressions from checking whether
    they're true or not
  * Eagerly parse PlatformExpressions as opposed to leaving them as
    strings
* Add checking for feature flag consistency
  * i.e., if `-binarycaching` is passed, you shouldn't be passing
    `--binarysource`
* Add the `Json::Reader` type which, with the help of user-defined
  visitors, converts JSON to your internal type
* VcpkgArgParser: place the switch names into a constant as opposed to
  using magic constants
  * In general update the parsing code so that this ^ works
* Add `Port-Version` fields to CONTROL files
  * This replaces the existing practice of
    `Version: <my-version>-<port-version>`

==== Smaller changes ====
* small drive-by cleanups to some CMake
  * `${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}` ->
    `${CURRENT_INSTALLED_DIR}`
  * Remove `-analyze` when compiling with clang-cl, since that's not a
    supported flag (vcpkg's build system)
  * Add a message about which compiler is detected by vcpkg's build
    system machinery
* Fix `Expected::then`
* Convert `""` to `{}` for `std::string` and `fs::path`, to avoid a
  `strlen` (additionally, `.empty()` instead of `== ""`, and `.clear()`)
* Add `Strings::strto` which converts strings to numeric types
* Support built-in arrays and `StringView` for `Strings::join`
* Add `operator<` and friends to `StringView`
* Add `substr` to `StringView`
* SourceParagraphParser gets some new errors
2020-06-30 10:40:18 -07:00
Alexander Neumann
14514508d8
[vcpkg] Add vcpkg item to project settings in Visual Studio ()
Co-authored-by: Curtis J Bezault <curtbezault@gmail.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-06-15 14:24:14 -07:00
Billy O'Neal
6ac6267f51
[vcpkg] Provide $(VcpkgRoot) and $(VcpkgCurrentInstalledDir) for customers. () 2020-06-04 13:33:47 -07:00
Billy O'Neal
4fb2256085
[vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links () 2020-06-03 19:31:28 -07:00
Billy O'Neal
cc4f93f434
[vcpkg] Rename the msbuild property VcpkgRoot to VcpkgCurrentInstalledDir, and set VcpkgRoot to the expected root instead. () 2020-05-29 16:38:03 -07:00
Christian Fersch
cbe795f788
[vcpkg] Fix cmake architecture detection on windows with ninja generator () 2020-05-21 11:39:03 -07:00
Kevin Hartman
f6dd5aee5b
[vcpkg] Fix macOS applocal.py dependency bundling. ()
This is the same issue and fix applied here https://github.com/OpenZWave/ozw-admin/issues/4.
2020-05-20 17:45:25 -07:00
Tsukasa Sugiura
687a2b9b89
[azure-kinect-sensor-sdk] Fix Deploy Azure Kinect Sensor SDK on Windows ()
* Fix Deploy Azure Kinect Sensor SDK on Windows

Fix deploy Azure Kinect Sensor SDK on Windows by copy Depth Engine.

* Fix Download URL by Version Number

* Fix Check SHA512 Hash of NuGet package

* Add Check Library Linkage

* Change Install Directory for Deploy Files

* Update ports/azure-kinect-sensor-sdk/portfile.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2020-05-08 14:35:59 -07:00
alcroito
c5f01e1dee
Add initial iOS support ()
* Add iOS community triplets and toolchain support

Added an iOS toolchain to enable building packages for iOS.
The toolchain is used when a triplet's VCPKG_CMAKE_SYSTEM_NAME is set
to iOS.

To configure which architecture should be built, as well as other
iOS specifics, the following triplet variables can be set:
- VCPKG_TARGET_ARCHITECTURE
- VCPKG_OSX_SYSROOT
- VCPKG_OSX_DEPLOYMENT_TARGET
- VCPKG_OSX_ARCHITECTURES

The following VCPKG_TARGET_ARCHITECTURE values are currently
supported:
 - arm, arm64, x64, x86.

The following VCPKG_OSX_SYSROOT values are currently supported:
 - iphoneos, iphonesimulator, or an absolute path to the device or
   simulator Xcode SDK.

VCPKG_OSX_DEPLOYMENT_TARGET can be set to control the minimum iOS
delopyment target for the built libraries.

CMAKE_OSX_ARCHITECTURES is derived from VCPKG_TARGET_ARCHITECTURE,
so generally it should not be set. In case if someone needs to target
a more specific architecture (like armv7k or arm64e), it can
be set in the triplet via VCPKG_OSX_ARCHITECTURES.

Note that only certain combinations of the architecture and sysroot
will work: simulator SDKs only provide x86-based libraries, etc.

The toolchain also sets CMAKE_SYSTEM_PROCESSOR for certain
configurations, because certain packages (like libpng) depend on the
processor type.

Added 4 community iOS triplets that build static libraries:
- arm-ios, arm64-ios, x86-ios, x64-ios.
The non-arm triplets target the iOS simulator.

The triplets build static libraries because they are easiest to
integrate into an iOS project. Dynamic libraries or frameworks require
code signing on iOS, which complicates integration.

Added heuristics to try and automatically detect what iOS triplet to
use when building your own CMake project (so when a CMake project sets
CMAKE_TOOLCHAIN_FILE to buildsystems/vcpkg.cmake), if no explicit
triplet is provided (VCPKG_TARGET_TRIPLET is undefined).

The heuristic checks for the values of CMAKE_SYSTEM_NAME and
CMAKE_OSX_ARCHITECTURES. Note that for this to work,
CMAKE_OSX_ARCHITECTURES needs to be set before the first project()
call in your CMake project.

Added workaround so find_package finds vcpkg installed packages
when targeting iOS.
This is done by saving / restoring the value of CMAKE_FIND_ROOT_PATH
while also adding the vcpkg package root in the find_package override
macro.
The workaround can be removed once vcpkg upgrades to CMake 3.15.0
or higher where the issue is fixed.

Fixes: 

* Fix building libpng and pcre2 targetting iOS

Fixes: 
2020-04-15 13:06:55 -07:00
Alexander Neumann
52273558f6
Map configuration also for single configuration generators () 2020-03-25 13:47:07 -07:00
Robert Schumacher
039098c954
[vcpkg] Add VCPKG_SUPPRESS_INSTALLED_LIBRARIES_WARNING and VCPKG_OVERRIDE_FIND_PACKAGE_NAME parameters to the vcpkg toolchain. ()
VCPKG_SUPPRESS_INSTALLED_LIBRARIES_WARNING - Silences warning about lacking installed libraries for the current triplet
VCPKG_OVERRIDE_FIND_PACKAGE_NAME - Enables cooperation with other tooling that may want to hook find_package
2020-02-09 14:40:13 -08:00
Alexander Neumann
ed0df8ecc4 Make VS 2019 default to x64 ()
Since CMake also does this
2020-01-24 12:26:35 -08:00
Alexander Neumann
504eeea514 Map MinSizeRel and RelWithDebInfo correctly ()
* Map MinSizeRel and RelWithDebInfo to Release by default

* switch to CMAKE_CONFIGURATION_TYPES

* changed mapping slightly

* add empty list element to the mapping

* more comments and an option to turn verbose messages on.

* removed line info.
It would require the file name to make sense out of it.
2020-01-09 15:26:27 -08:00
Alexander Neumann
f8cfe6c164 Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ()
* Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES

to respect already set values
closes 

* ws change to trigger full rebuild
2019-12-20 12:20:31 -08:00
Don
c7542de3f3 Use CMAKE_TRY_COMPILE_PLATFORM_VARIABLES to propogate values ()
CMAKE_TRY_COMPILE_PLATFORM_VARIABLES is used when CMake 3.6.0 or higher
is encountered. For older versions the previous behavior emulating this
functionality is used.
2019-09-23 13:43:52 -07:00
dan-shaw
0f3b6fc163 vs 2019 integration bug () 2019-08-12 14:41:53 -07:00
crusader-mike
126812d18b Resolves "project is never up-to-date" problem (issue 6179) () 2019-07-22 10:47:57 -07:00
shadowxiali
555b760c67 Update applocal.ps1 ()
* Update applocal.ps1

* Update applocal.ps1

Fix Microsoft#2801,
prev modify mistake UTF8 to UTF

* Update applocal.ps1

in win7 chinese path, must utf8 to avoid copy dll fail
2019-06-12 17:41:28 -07:00
Thad House
94cf18d119 Fix vcpkg things 2019-05-31 13:50:30 -07:00
Thad House
788af2a75c Merge master 2019-05-31 13:49:13 -07:00
Alexander Neumann
bdb77a361c make regex case insensitive () 2019-05-24 16:35:40 -07:00
Sean Warren
84e19f1ce2 [vcpkg.cmake] Remove use of IN_LIST ()
Fixes regression introduced by  in CMake projects with minimum version <3.3 where CMP0057 is not set to NEW
Fixes 
2019-05-18 23:33:16 -07:00
Sean Warren
031e494970 Add mac applocal for bundling dependencies () 2019-05-16 13:24:02 -07:00
lukka
f2f31240a0 fix parens in cmake variable name () 2019-05-13 00:11:07 -07:00
Alexander Neumann
884bf46bf4 also ignore x86 openssl paths () 2019-05-12 18:37:02 -07:00
Thad House
d91644d3f5 Add support for CMake generation with VS 2019 () 2019-04-24 18:13:16 -05:00
Thad House
dd2100ee80 VS 2019 support 2019-04-14 11:09:32 -07:00
Thad House
73a99865b1 Add WPILib port for vcpkg 2019-04-14 11:09:32 -07:00
Damian Jarek
0e4c999b21 Fix installation failure when system Boost present ()
Boost 1.70 introduces "native" cmake config scripts which are
accidentally used when installing a vcpkg package. This only occurs
when Boost 1.70 is installed in the system when the user uses
`vcpkg install`.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
2019-04-04 19:13:10 -07:00
Phil Christensen
d72e38036b
Merge pull request from Neumann-A/VTK_8.2.0
[VTK 8.2.0/HDF5 1.10.5] Upgrade VTK and HDF5
2019-03-14 23:12:31 -07:00
Alexander Neumann
1c7972a011 fix missing debug references in cmake generated (release) target files. 2019-03-14 22:24:29 +01:00
Stefano Sinigardi
0e77ca352e [tiff] use vcpkg wrapper for all configs, remove dead code ()
* [tiff] use vcpkg wrapper for all configs, remove dead code

* [tiff] update CONTROL
2019-03-13 22:51:16 -07:00
Sean Warren
a9f8430961 [hdf5] Use cmake wrapper to ensure consuming libraries link to szip ()
* [hdf5] Use cmake wrapper to ensure consuming libraries link to szip in static build

* [hdf5] Move hdf5 cmake code from vcpkg.cmake to vcpkg-cmake-wrapper

* [hdf5] Do not force search in config mode

* [hdf5] balance needs of vtk and kealib
2019-03-05 11:09:22 -08:00