Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity
1,387 Commits 1 Branch 78 Tags 505 MiB
Commit Graph

102 Commits

Author SHA1 Message Date
Alexander Karatarakis fd0adc561d [vcpkg_build/install_cmake] Add option to disable parallel building 2017-01-13 19:09:42 -08: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
Alexander Karatarakis f4622dce99 [7zip] Also consider the system version, if available 2017-01-11 20:54:25 -08: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