mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 06:41:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,778 Commits 1 Branch 58 Tags 412 MiB
7a2a237e13
Commit Graph

296 Commits

Author SHA1 Message Date
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
Alexander Karatarakis
ccda20a858 Remove $downloadName variable 2017-01-24 12:01:11 -08:00
Alexander Karatarakis
93c3c0648a [VS2017] Enable building with v141 toolset 2017-01-23 19:25:47 -08:00
Alexander Karatarakis
7c9db95fec Bump downloaded git version 2017-01-23 18:47:38 -08:00
Alexander Karatarakis
868a7623ad Bump nuget.exe version 2017-01-23 18:47:11 -08:00
Robert Schumacher
44810f267d [vcpkg integrate] Lower verbosity of MSBuild messages. 2017-01-23 18:26:57 -08:00
Alexander Karatarakis
522b393901 Bump version of required CMake to 3.7.2 2017-01-23 17:02:43 -08:00
Alexander Karatarakis
58aeb68442 [VS2017] Enable building vcpkg itself with VS2017 2017-01-23 12:54:33 -08:00
Alexander Karatarakis
e6c127511e [VS2017] Add powershell script to find any MSBuild with C++ support 2017-01-23 12:54:03 -08:00
Alexander Karatarakis
bb639bfa9c [VS2017] Add powershell script to enumerator VS2017 instances 2017-01-23 12:53:18 -08:00
Alexander Karatarakis
030ed27117 Fix integration when $(Platform) is empty 2017-01-19 17:38:56 -08:00
Robert Schumacher
2b48e78086 Merge pull request #529 from codicodi/add-glib 
Add glib
 2017-01-19 14:04:09 -08:00
Alexander Karatarakis
fd0adc561d [vcpkg_build/install_cmake] Add option to disable parallel building 2017-01-13 19:09:42 -08:00
codicodi
f5a0a64e44 [glib] tooools 2017-01-14 02:59:41 +01:00
codicodi
eb7ccc1223 Revert "[glib] use win_iconv and add subdir for tools" 
This reverts commit ccd3e399f0.
 2017-01-14 02:55:41 +01:00
Robert Schumacher
da09df713f [vcpkg integration] Explicitly skip empty entries instead of recursing. Fixes #460. 2017-01-13 17:39:12 -08:00
Alexander Karatarakis
2bc4064b1e [vcpkg_build_cmake] Add option to specify the 64-bit toolset 2017-01-13 17:30:48 -08:00
codicodi
ccd3e399f0 [glib] use win_iconv and add subdir for tools 2017-01-14 02:15:34 +01:00
Alexander Karatarakis
f4622dce99 [7zip] Also consider the system version, if available 2017-01-11 20:54:25 -08:00
codicodi
275a59dd9d Add glib 2017-01-11 21:20:53 +01:00
Albert Ziegenhagel
1911fa8182 Acquire 7z 
Since 7zip is distribute as installer only (no archive) we use msiexec to extract the installer without installing it. msiexec should be available on all windows computers (located in C:/Windows/system32)
 2017-01-11 11:37:19 +01:00
Alexander Karatarakis
4f5f52ff47 Fix error message when looking for PYTHON2 2017-01-10 16:02:53 -08:00
Alexander Karatarakis
c5dad5306e [vcpkg_apply_pathces] Fix typo (also trailing whitespace) 2017-01-06 14:57:45 -08:00
Silvio
1decb1b52c cmake: add qmake-related helpers function 2017-01-05 23:46:43 +01:00
Silvio
f4c34bb42d vcpkg_apply_patches: add QUIET option 2017-01-05 23:46:43 +01:00
Christian Ullrich
335c15a9d0 Copy DLLs before attempting to regsvr32. 2016-12-23 14:47:38 +01:00
Christian Ullrich
c0cb3ca009 Copy DLLs for all project types. 
$(TargetPath) is a simpler way of getting the primary output than assembling it from multiple variables. In addition, $(OutputType) matches $(TargetExt) only for .exe projects.
 2016-12-23 14:47:26 +01:00
Robert Schumacher
31b713ca1f [vcpkg] Remove all instances of TRIPLET_SYSTEM_NAME; use VCPKG_CMAKE_SYSTEM_NAME instead. 2016-12-07 21:40:36 -08:00
Robert Schumacher
5359a542a5 [vcpkg] Disable all interactions with CMake registry -- we are effectively implementing our own registry and they don't nest very well at all. 
Fixes #334.
 2016-12-06 01:26:46 -08:00
Robert Schumacher
a710f67e52 [vcpkg] Remove automatic include paths and link paths from CMake toolchain. It is customary to use find_X() in CMake, so automatic paths are not needed. 2016-12-03 02:54:37 -08:00
Charlie Barto
f874d15eca fixed vcpkg trying to set properties on INTERFACE and ALIAS targets 2016-12-02 12:24:14 -05:00
Robert Schumacher
61e484a640 Merge fix #306 2016-11-29 18:27:45 -08:00
Alexander Karatarakis
d933562a58 Move PYTHON2 "acquisition" to vcpkg_find_acquire_program 2016-11-28 17:17:28 -08:00
Robert Schumacher
61b653aad3 [vcpkg.cmake] Add lib and lib/manual-link to CMake's default link directories when using our toolchain. 2016-11-26 00:10:42 -08:00
Robert Schumacher
32157f8ce5 [vcpkg-integrate] Provide an opt-out for autolinking. Properly suppress integration via MSBuild when using CMake. 
Add lib\ and lib\manual-link\ to additional library paths.

[gtest] Because the four libraries provided by gtest supply redundant symbols and define main, opt them all out.

Addresses #306.
 2016-11-25 23:10:27 -08:00
Alexander Karatarakis
a65f4c3c0b [bootstrap] Use "unknownhash" if git is not available. Resolves #305 2016-11-21 18:10:21 -08:00
Charlie Barto
447160a19e add support for VS 2017 2016-11-19 01:33:31 -05:00
charlie barto
d56ab64fde added x64 as a prefix to search for cl.exe in the toolchain file, this makes things work with VS '15' if you manually specify the triplet 2016-11-16 12:38:30 -05:00
Robert Schumacher
637dac384c [vcpkg-cmake-toolchain] Avoid IN_LIST to reduce required cmake version 2016-11-11 16:17:39 -08:00
Robert Schumacher
d746bf5822 Merge pull request #273 from Morten242/multithreaded_install 
Add /m switch to vcpkg_install_cmake
 2016-11-10 17:57:43 -08:00
Mårten Nordheim
34c585901e Add /m switch to vcpkg_install_cmake 
(https://github.com/Microsoft/vcpkg/issues/258#issuecomment-259839046)
 2016-11-11 01:16:24 +01:00
Mårten Nordheim
60c61d9305 Add /m switch to vcpkg_build_msbuild.cmake 
(https://github.com/Microsoft/vcpkg/issues/258#issuecomment-259018977)
 2016-11-11 01:15:14 +01:00
Alexander Karatarakis
097626c317 Use /DEPENDENTS instead of /IMPORTS in applocal.ps1 2016-11-08 19:02:59 -08:00
Alexander Karatarakis
dbab03a1a8 Merge branch 'postbuild' 2016-11-08 15:09:56 -08:00
Alexander Karatarakis
e642767c84 Remove triplet inclusion from the template portfile 2016-11-08 14:45:30 -08:00
Alexander Karatarakis
1808d461b0 triplet is now automatically included before portfiles. 
Also remove trailing whitespaces from portfiles
 2016-11-08 14:25:47 -08:00
Alexander Karatarakis
6e9d17f73c Introduce BUILD_INFO file. Significant change in the way static/dynamic is 
handled
 2016-11-08 14:12:49 -08:00
Robert Schumacher
1bc75b551d Merge branch 'qt5-add' of https://github.com/Barath-Kannan/vcpkg into Barath-Kannan-qt5-add 2016-11-07 16:28:14 -08:00
Alexander Karatarakis
6e9eafb7ed Do a git-reset after using git --worktree checkout 2016-11-06 20:11:26 -08:00
Robert Schumacher
e5152851f2 Revert d58f0c6680. MSBuild (and CMake) do not allow switching on CRT type effectively, so we should use more robust logic. 2016-11-04 17:37:58 -07:00
Robert Schumacher
d7ff71610b [vcpkg-apply-patches] Correct issue with src directories which contain a config\ folder. Reduce verbosity of output. 2016-11-02 16:49:15 -07:00
Charles Barto
b25c13c155 made some qt5 fixes 2016-11-01 19:19:05 -04:00
Alexander Karatarakis
789855546c Fix issues with the integration file 2016-10-31 17:02:39 -07:00
Alexander Karatarakis
b04b264f29 [vcpkg_configure_cmake] Fix C_FLAGS 2016-10-31 16:18:30 -07:00
Alexander Karatarakis
d58f0c6680 [integration] Enable static lib integration. Also, detect .vcpkg-root 2016-10-31 13:32:58 -07:00
Alexander Karatarakis
600e11d83c [vcpkg_copy_pdbs] Branch on dynamic/static. Resolves #224 2016-10-31 12:29:41 -07:00
Robert Schumacher
bf16c7f4cc [vcpkg-cmake] Fix regression in Ninja generator support for x86. 2016-10-31 10:11:25 -07:00
Robert Schumacher
956f3b110b [vcpkg-cmake] Added slightly more error checking 2016-10-31 09:37:13 -07:00
kumar8600
0b54a01149 Add cl.exe path based architecture detection for CMake toolchain 2016-10-30 18:46:24 +09:00
Alexander Karatarakis
2efbe4ec6f [vcpkg.targets] Change VCPkg casing to Vcpkg 2016-10-28 18:58:39 -07:00
Barath Kannan
095afa2ff1 incorrect error file variable 2016-10-25 22:31:27 +11:00
Barath Kannan
162ba52f43 need a function to repeatedly build up to a number of failures, since qt builds are so flaky 2016-10-25 20:56:02 +11:00
Robert Schumacher
dffedfaa32 [vcpkg_apply_patches] Improve error message from failed patch apply. 2016-10-24 21:13:30 -07:00
Barath Kannan
8dbeacd5ad static linkage and jom fixes 2016-10-25 12:39:50 +11:00
Robert Schumacher
0f0c0b7ad9 [vcpkg_apply_patches] Specify git-dir to avoid errors due to invalid git repo 2016-10-24 17:06:33 -07:00
Barath Kannan
0af6ca8123 add qt5 support, working install but static linkage with RT needs to be implemented 2016-10-25 02:06:27 +11:00
Alexander Karatarakis
bcfe15ce2b Add two spaces in front of message() to fix formatting 
In Warning or Error, indented text is considered preformatted.
Otherwise CMake tries to format it itself, and there are issues with
whitespace in the path
 2016-10-20 15:46:32 -07:00
Alexander Karatarakis
7dea245b9c [vcpkg_apply_patches] Print that patch applying failed instead of 
FATAL_ERROR
 2016-10-18 18:25:45 -07:00
Alexander Karatarakis
6059b2bf2f [vcpkg_apply_patches] Also print working dir 2016-10-18 16:54:48 -07:00
Alexander Karatarakis
829f32e18b Merge branch 'master' of https://github.com/Microsoft/vcpkg 2016-10-18 16:32:42 -07:00
Alexander Karatarakis
4488064f81 [vcpkg_apply_patches] Check if patch was properly applied 2016-10-18 16:17:47 -07:00
Charles Barto
eba9f6a812 added static support to glbinding 
changed glbinding to support new configure
 2016-10-18 17:59:55 -04:00