Commit Graph

272 Commits

Author SHA1 Message Date
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
Robert Schumacher
325a50f54b [vcpkg] Force compiler character set to UTF-8. Fixes #141. 2016-10-11 10:32:40 -07:00
Mårten Nordheim
1009cd47bb Use -noprofile to avoid loading powershell profiles 2016-10-11 15:51:42 +02:00
Robert Schumacher
f661f973a4 [vcpkg] Tweak default compiler flags to match the VS new project defaults where appropriate 2016-10-11 04:36:37 -07:00
Robert Schumacher
711c4ec6cc Merge branch 'release-pdbs' 2016-10-11 04:05:44 -07:00
Adam Martin
3f77292da5 Fixed tabs to spaces formatting 2016-10-09 10:59:37 -05:00
Adam Martin
32548fe2ed Add the tools directory to CMAKE_PROGRAM_PATH so find_program and similar can locate installed tools 2016-10-09 10:55:46 -05:00
Alexander Karatarakis
50fb104f6a Change VCPKG_BUILD_SHARED_LIBS to VCPKG_LIBRARY_LINKAGE with values
dynamic or static
2016-10-07 16:34:31 -07:00
Robert Schumacher
96f977d38f [vcpkg] Change CMake build flags to enable pdbs in Release 2016-10-07 12:55:41 -07:00
Robert Schumacher
b1fe038a83 Remove use of vcpkg_build_cmake() across all portfiles. Fixes #123 2016-10-06 15:29:37 -07:00
Alexander Karatarakis
595ec61dee Release script no longer adds a git tag 2016-10-06 14:24:10 -07:00
Alexander Karatarakis
7c05facd8a Forward triplet options to default CMAKE variables 2016-10-06 13:46:41 -07:00
Alexander Karatarakis
57b638fea9 Fix release script to properly checkout .vcpkg-root in the temp dirs 2016-10-05 17:31:27 -07:00
Alexander Karatarakis
6b2ac13699 [doVcpkgRelease] ErrorActionPreference = "Stop"
To prevent tags from being created on fail
2016-10-05 17:20:45 -07:00
Alexander Karatarakis
0aa4dfb718 Update portfile template to include SOURCE_PATH 2016-10-05 16:59:59 -07:00
Robert Schumacher
fb6ec0bb82 [vcpkg] Fix UWP regression introduced with ac2e248e8f. Fixes #111 2016-10-03 16:52:56 -07:00
Robert Schumacher
e03e617f06 [ace] Minor cleanup after PR #108 2016-10-03 16:14:27 -07:00
Silvio
6cf29cdfb6 Fix space/tabs typo 2016-10-02 13:11:45 +02:00
Silvio
bcaae465c5 Add platform option to vcpkg_build_msbuild
Also added documentation for the platform option and the rest
of the function
2016-10-02 12:55:30 +02:00
Alexander Karatarakis
e507c14229 create & edit commands now only handle package names 2016-09-30 18:21:38 -07:00
Robert Schumacher
241ca8cd17 [vcpkg] Improve create command to generate initial CONTROL file 2016-09-30 17:09:17 -07:00
Alexander Karatarakis
ac2e248e8f Rename variable to CMAKE_TRIPLET_FILE 2016-09-29 15:00:39 -07:00
Alexander Karatarakis
17b95eb28c Remove leading underscore in _VCPKG_TARGET_TRIPLET and add CACHE attribute 2016-09-29 14:58:09 -07:00
Robert Schumacher
d9aba9f0fe [vcpkg] Add extract destination argument to vcpkg_extract_source_archive 2016-09-29 08:31:12 -07:00
Alexander Karatarakis
48fe5f36b2 Rename SCAFFOLD to CREATE to match vcpkg create 2016-09-28 16:25:32 -07:00
Alexander Karatarakis
e4ada711c2 Add Common Ambient Variables to porfile template 2016-09-28 16:21:47 -07:00
Robert Schumacher
cc29d43f85 Merge branch 'master' of https://github.com/microsoft/vcpkg 2016-09-27 15:51:16 -07:00
Robert Schumacher
288bdf367a [vcpkg] Enable multicore builds by default. 2016-09-27 15:50:11 -07:00
Alexander Karatarakis
7147ef13eb Merge branch 'Add-mirror-support' of https://github.com/Ninetainedo/vcpkg into Ninetainedo-Add-mirror-support 2016-09-26 13:47:52 -07:00
Ninetainedo
2491a16b0d Updated portfile.in.cmake to use URLS 2016-09-25 14:46:43 +02:00
Ninetainedo
586c96e1b1 Used a function to check file integrity 2016-09-25 00:36:50 +02:00
Ninetainedo
c55c9df228 Link to "issues" instead of "new issue" 2016-09-25 00:26:05 +02:00
Ninetainedo
51da39c1ed Display status on download error 2016-09-25 00:25:40 +02:00
Ninetainedo
62d9473412 Added spaces between brackets for double clicking 2016-09-25 00:24:38 +02:00
Ninetainedo
930d0a7ded URL and MIRRORS are now URLS
Updated all portfiles accordingly.
2016-09-25 00:23:04 +02:00
Robert Schumacher
cdfa4ea1df Reduce repetition of relative paths in vcpkg.cmake to reduce future errors 2016-09-24 12:05:56 -07:00
Jan Hrubý
1bec0fcb73 fixed an incorrect relative directory that pointed into wrong location 2016-09-24 15:44:20 +02:00
Ninetainedo
add26b7b5f Updated vcpkg_download_distfile.cmake to handle MIRRORS. Also updated the HASH errors to match the CMake formatting (easier to read) 2016-09-24 15:23:18 +02:00
Jan Hrubý
14c09eeb22 changed execution policy from remotesigned to unrestricted 2016-09-23 13:17:51 +02:00
Silvio
0bf9af15dc Fix wrong CMAKE_PREFIX_PATH in vcpkg.cmake 2016-09-23 00:26:18 +02:00
Ninetainedo
8cee9c6e07 Replaced everything concerning MD5 with SHA512 2016-09-22 21:30:58 +02:00
Alexander Karatarakis
764afd8619 CMake now automatically detects the root directory via .vcpkg-root 2016-09-22 03:08:27 -07:00
Robert Schumacher
e04ecb3dd8 Add stamp file for extracted archives.
This enables multiple archives to be correctly expanded into the same build tree. Previously, the second archive will detect as being already extracted since 'src' exists.
2016-09-20 21:09:00 -07:00
Alexander Karatarakis
f78c64e3a9 Remove unused function 2016-09-19 19:01:04 -07:00
Alexander Karatarakis
b9a0cee78d Powershell scripts now detect the root dir via the .vcpkg-root file 2016-09-19 18:52:17 -07:00
Alexander Karatarakis
edb8b44b13 [bootstrap.ps1] Use older-powershell-friendly way to determine path 2016-09-19 13:59:32 -07:00
Alexander Karatarakis
ccca198c1b Initial commit 2016-09-18 20:54:03 -07:00