Commit Graph

267 Commits

Author SHA1 Message Date
İsmail Dönmez
656ba237d7
Use msys64 on 64bit systems 2017-04-24 14:19:26 +02:00
Robert Schumacher
169521070a [vcpkg] Ninja is only 64-bit; do not use on x86 2017-04-23 00:11:42 -07:00
Alexander Karatarakis
5fbc9c4563 Update cmake version to 3.8.0 (was 3.8.0rc1) 2017-04-21 18:41:01 -07:00
Alexander Karatarakis
4d850d153a [vcpkg.cmake] Detect .vcpkg-root 2017-04-20 16:19:39 -07:00
Robert Schumacher
35f8d033b7 [vcpkg] Add script for internal CI. This makes the set of built packages more transparent and updatable. 2017-04-19 04:54:30 -07:00
Robert Schumacher
bfb76e52a4 [vcpkg] Fix getWindowsSDK to correctly handle the new optional c++ desktop deployment of the Windows SDK. 2017-04-13 18:59:13 -07:00
Robert Schumacher
92c0a91d3f [vcpkg-msbuild] Fix line wrapping bug on Win7.
On Win7, calling powershell via MSBuild results in normal output lines being split based on the ConHost system-wide default line length settings.

The fix is to first write all the lines to a file, then load that file as into an MSBuild ItemGroup. This avoids all interaction with ConHost.
2017-04-11 16:32:45 -07:00
Robert Schumacher
1513062f0b [vcpkg-scripts] Improve verbose logging in findAnyMSBuildWithCppPlatformToolset. 2017-04-11 14:41:57 -07:00
Robert Schumacher
eb9b85c49d [vcpkg] Switch several usages of -ExecutionPolicy Unrestricted to Bypass to avoid failures due to Mark Of The Web 2017-04-08 18:53:39 -07:00
Wei Mao
6a2e1c77fe Fix issue 556: need setup include path for rc.exe (wtl fails to build) 2017-04-07 09:50:24 -07:00
Robert Schumacher
3839b44d18 [vcpkg-cmake] Use Bypass to avoid mark-of-the-web issues in cmake toolchain. 2017-04-06 15:08:35 -07:00
Robert Schumacher
db73e73c56 [vcpkg] Add bootstrap-vcpkg.bat to improve first-time experience. 2017-04-01 03:58:45 -07:00
Robert Schumacher
558d54dd4e [qt5] Add qtdeploy.ps1 to enhance applocal.ps1 when Qt is in use. 2017-03-31 06:35:23 -07:00
Robert Schumacher
bbaf4d77e7 [applocal.ps1] Refactor out binary deployment 2017-03-31 03:11:06 -07:00
Robert Schumacher
1c9fd4aefc [applocal.ps1] Keep global set of searched binaries and avoid excessive recursion. 2017-03-31 03:05:15 -07:00
Robert Schumacher
5414655ea4 [vcpkg] Fix regression introduced in 8dc2699e5d. Fixes #873. Fixes #871. Fixes #874. Fixes #876.
When using the toolchain file, VCPKG_TARGET_TRIPLET was not specified, which resulted in all libraries being built against x86-windows.
2017-03-31 00:35:40 -07:00
Robert Schumacher
80e1a39a5d Merge pull request #864 from codicodi/fix-toolchain
[vcpkg.cmake] handle alias executable targets
2017-03-29 09:54:48 -07:00
Robert Schumacher
a9a8772ad4 [vcpkg-configure-cmake] Rely on toolchain to provide CMAKE_PREFIX_PATH 2017-03-28 17:18:07 -07:00
codicodi
17c819c353 [vcpkg.cmake] handle alias executable targets 2017-03-28 19:08:30 +02:00
Robert Schumacher
32827f98c0 [vcpkg] Fix bug when downloading Git. 2017-03-24 21:53:19 -07:00
Alexander Karatarakis
3b511adfe4 Add EMPTY_INCLUDE_FOLDER policy. Resolves #816 2017-03-24 12:49:08 -07:00
Robert Schumacher
85169faaea [vcpkg-toolchain] Automatically detect Windows SDK version. 2017-03-21 17:02:18 -07:00
Robert Schumacher
8dc2699e5d [vcpkg-configure-cmake] Use toolchain in internal builds. 2017-03-21 01:48:52 -07:00
Alexander Karatarakis
38233af9a2 Look for 'git' instead of 'git.exe'. Resolves #820 2017-03-20 16:58:08 -07:00
Robert Schumacher
fded520642 [vcpkg-qmake] Tidy qmake-based builds. Search for qmake.exe inside tools. 2017-03-20 16:20:02 -07:00
Alexander Karatarakis
e4d337cc96 Use -NoProfile when calling powershell 2017-03-15 16:25:06 -07:00
Alexander Karatarakis
fa4b4d48d9 Fix vcpkg_get_windows_sdk.cmake to properly handle space in path 2017-03-15 16:25:06 -07:00
Robert Schumacher
e91218e638 Merge pull request #790 from Mixaill/msbuild-platformtoolset
vcpkg_build_msbuild: add PLATFORM_TOOLSET property
2017-03-14 17:10:33 -07:00
Mikhail Paulyshka
c791d19bd1 vcpkg_configure_cmake: fix ARM configuring 2017-03-14 03:59:41 +03:00
Mikhail Paulyshka
b87c1c1bea vcpkg_build_msbuild: add PLATFORM_TOOLSET property 2017-03-14 02:18:23 +03:00
Robert Schumacher
e387f314a8 Merge pull request #775 from Mixaill/msvs2017-mpir-winsdk
[mpir] detect Windows SDK version (was: retarget MSVS2017 to Windows 10 SDK)
2017-03-13 14:15:56 -07:00
Robert Schumacher
26b9278a4c [vcpkg_build_msbuild] Perform a full rebuild by default. 2017-03-13 14:09:11 -07:00
Robert Schumacher
8fc1447da7 [vcpkg_build_msbuild] Default to overriding WinSDK version 2017-03-13 14:02:28 -07:00
Mikhail Paulyshka
27f0759cab template: add some more variables 2017-03-13 03:39:46 +03:00
Mikhail Paulyshka
cff0971773 vcpkg_build_msbuild: add TARGET_PLATFORM_VERSION property 2017-03-12 21:22:59 +03:00
Robert Schumacher
a2a558bd03 [vcpkg] Fix regression in 7b14894d. Fixes #772. 2017-03-11 19:08:16 -08:00
Alexander Karatarakis
bfa5812a6b Update version of VS SetupAPI nuget package 2017-03-10 14:10:14 -08:00
Robert Schumacher
883b865f8e [vcpkg-configure-cmake] Alwasy set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP to TRUE 2017-03-06 10:35:03 -08:00
Alexander Karatarakis
b03b578ffc Rename policy to OnlyReleaseCRT 2017-03-03 19:09:24 -08:00
Alexander Karatarakis
c2a368976d Add policy: NoDebugBinaries 2017-03-03 19:00:48 -08:00
Robert Schumacher
2f8d8d8b18 [ffmpeg] Initial commit of version 3.2.4 2017-03-02 07:29:19 -08:00
Robert Schumacher
61254273ba Merge pull request #701 from MKlimenko/master
Add proxy credential support
2017-02-28 06:09:03 -08:00
Alexander Karatarakis
58002f6239 Tweak -Verbose messages 2017-02-24 16:36:10 -08:00
Alexander Karatarakis
789f26c741 Rewrite WindowsSDK detection 2017-02-24 16:28:36 -08:00
Alexander Karatarakis
c81edf7592 Rewrite MSBuild detection
Add -Verbose messages. Look for VS2015 in Program files as well as registry
2017-02-24 16:27:29 -08:00
Alexander Karatarakis
8f89f41a06 Inline variables 2017-02-24 15:17:18 -08:00
Alexander Karatarakis
beb1250fe4 Improve functions that detect ProgramFiles in CMake 2017-02-24 15:02:10 -08:00
Alexander Karatarakis
60e67651c3 Improve functions that detect ProgramFiles in powershell 2017-02-24 14:30:56 -08:00
Alexander Karatarakis
984f710c3f Tweak Verbose messages 2017-02-23 16:01:20 -08:00
Alexander Karatarakis
6367924964 Disable Verbose-level messages for imported module 2017-02-23 15:50:52 -08:00
Alexander Karatarakis
b5dc358d49 Remove unneeded Import-Module directive 2017-02-23 15:50:28 -08:00
Robert Schumacher
7dd7490468 [vcpkg] Force JOM to be updated to 1.1.2 2017-02-23 03:29:25 -08:00
Mikhail Klimenko
42ac9bbe1e Add proxy credential support 2017-02-22 14:51:05 +03:00
Robert Schumacher
fa3f9dd962 [opengl] Add -ExecutionPolicy Bypass when invoking powershell as a child
process.
2017-02-21 23:29:31 -08:00
Alexander Karatarakis
b831a7d9ee [find/acquire python] Update to v1.1.2 from v1.1.1 2017-02-21 19:39:53 -08:00
Alexander Karatarakis
4dc8f546f6 [find/acquire python] Use 32-bit versions and bump to latest patch version 2017-02-21 19:31:52 -08:00
Alexander Karatarakis
c44c085e8b Add vcpkg_get_windows_sdk.cmake 2017-02-21 18:09:32 -08:00
Alexander Karatarakis
a2cebceafe Rename findTargetPlatformVersion to getWindowsSDK 2017-02-21 17:45:08 -08:00
pravic
9aa7c944f2 Allow to use git.cmd in addition to git.exe
In respect of #682 and https://cmake.org/Bug/bug_relationship_graph.php?bug_id=9879.
2017-02-21 08:24:14 +03:00
Alexander Karatarakis
0dbc59da7a Fix script for powershell in Win7 2017-02-16 20:00:00 -08:00
Robert Schumacher
cf537a2623 [vcpkg] Use the Registry to find VS2015 2017-02-16 19:21:55 -08:00
Alexander Karatarakis
d36b292ae2 Don't prompt for downloading nuget when finding VS instances
This means bootstrap no longer prompts
2017-02-16 19:13:10 -08:00
Alexander Karatarakis
7b4cae57be fetchDependency.ps1: add option to override prompting for download 2017-02-16 18:48:14 -08:00
Alexander Karatarakis
66cc4eed68 CMake: Bump version to 3.8.0 to resolve VS2017 UWP build issues 2017-02-16 18:02:16 -08:00
Alexander Karatarakis
03b6548653 Use MinGit instead of PortableGit. Resolves #662 2017-02-15 16:35:51 -08:00
Alexander Karatarakis
edec017ece Fix download of nasm. Resolves libjpeg-turbo build error 2017-02-14 19:20:13 -08:00
Alexander Karatarakis
da26d09716 Add functions to find Program Files folders on the CMake side 2017-02-14 17:29:47 -08:00
Alexander Karatarakis
444f28dd24 Add functions to find Program Files folders on the powershell side 2017-02-14 16:53:29 -08:00
Robert Schumacher
e139716c8f Merge pull request #653 from codicodi/add-libepoxy
Add libepoxy
2017-02-12 23:54:52 -08:00
Robert Schumacher
4cef21b894 [bootstrap] Specify NuGet Source to avoid impact from user config. 2017-02-11 09:51:02 -08:00
Alexander Karatarakis
cfd5adaf13 Improve WinSDK detection 2017-02-09 15:26:40 -08:00
codicodi
b65ae7c277 tabs to spaces 2017-02-09 18:15:57 +01:00
codicodi
6ca475a5b4 add libepoxy 2017-02-09 18:13:52 +01:00
Alexander Karatarakis
4f8e4af363 Remove unneeded Import-Module 2017-02-08 22:31:04 -08:00
Alexander Karatarakis
b6b69025c3 bootstrap.ps1 now detects the available Windows SDKs 2017-02-08 22:29:29 -08:00
Robert Schumacher
116b1b8c66 Reorder path alterations to generally append instead of prepend.
This solves the issue where some software bundles (git) provide multiple executables in the same folder, which can override other desired programs (link.exe).
2017-02-08 17:39:31 -08:00
Robert Schumacher
4d43330241 Merge branch 'master' into codicodi-ninja-support 2017-02-08 15:24:59 -08:00
Alexander Karatarakis
e1aea256b8 Fix variable name and guard against 0 instances 2017-02-08 02:07:53 -08:00
Robert Schumacher
b8ae855786 Merge pull request #644 from Microsoft/dev/roschuma/no-intel-mkl
[vcpkg] Disable Intel MKL for all internal builds. Fixes #609.
2017-02-08 01:25:22 -08:00
Alexander Karatarakis
f9616c6994 Add new Policy: Empty Package 2017-02-07 17:02:57 -08:00
Alexander Karatarakis
acc669e869 Update SetupAPI version. Explicitly specify version. Use -nocache 2017-02-06 15:55:39 -08:00
Alexander Karatarakis
7207316ed4 Don't download nupkg. nuget.exe auto-downloads it 2017-02-06 15:29:38 -08:00
Ben Harper
504545d2c8 Add a workaround for another BITS code path
The fix from last week (ce9927f732)
worked for downloading most dependencies, but there is still one
BITS transfer code path, which this fix addresses.
2017-02-06 14:48:30 +02:00
Robert Schumacher
f7dcbe97ff [vcpkg] Disable Intel MKL for all internal builds. Fixes #609. 2017-02-03 17:46:09 -08:00
codicodi
95af9aac7c Add Ninja support 2017-02-03 17:16:13 +01:00
Alexander Karatarakis
ce9927f732 Improve error handling if BITS transfer fails 2017-02-02 16:00:30 -08:00
Robert Schumacher
b2b2c91369 [vcpkg] Override Boost_COMPILER setting for all packages and toolchain to enable mixing VS2015 and VS2017 2017-02-02 15:41:34 -08:00
Robert Schumacher
a3eaed8f1f [vcpkg] Add /MP to base compilation flags, enabling parallel builds. 2017-02-01 16:19:27 -08:00
Alexander Karatarakis
cd0b7d644b Add PolicyDLLsWithoutLIBs policy 2017-02-01 11:42:41 -08:00
Alexander Karatarakis
f2d40c5b81 Download 32-bit perl instead of 64-bit. Resolves #620 2017-02-01 11:38:58 -08:00
Robert Schumacher
8b21933367 [vcpkg-msbuild] Add troubleshooting message to MSBuild projects with Importance=Normal 2017-01-31 17:53:08 -08:00
Alexander Karatarakis
872332df34 Remove doVcpkgRelease.ps1 2017-01-30 18:13:58 -08:00
Alexander Karatarakis
8b602f97c8 [vcpkg_copy_pdbs] Force output to be in en-us. Resolves #587 2017-01-25 18:32:24 -08:00
Robert Schumacher
d04e78815a [vcpkg] Do not build tests when running scripts\bootstrap.ps1. 2017-01-25 15:05:51 -08:00
Robert Schumacher
318d32e870 [vcpkg] Add user-facing notification to prompt rebuilding vcpkg.exe in face of cmake changes. 2017-01-24 18:55:41 -08:00
Alexander Karatarakis
af0727cbc0 Improve detection of VS installation instances 2017-01-24 17:51:45 -08:00
Robert Schumacher
33ce94a456 [vcpkg integrate] Exit silently if target cannot be found. 2017-01-24 15:17:45 -08:00
Alexander Karatarakis
f2ac7a32aa FetchDependency.ps1 now returns the downloaded exe's path 2017-01-24 12:36:46 -08:00
Alexander Karatarakis
d96f56736e Fix path to nuget.exe 2017-01-24 12:32:03 -08:00
Alexander Karatarakis
d5e7a501e9 Download nuget.exe in a version-including subfolder in Downloads\ 2017-01-24 12:30:14 -08:00