Commit Graph

543 Commits

Author SHA1 Message Date
Bruce Jones
78b1396b88 Copy local dependencies for library targets (#2787)
* Fix for issue #2786

* [vcpkg-cmake-toolchain] Only applocal dependencies for shared libraries
2018-02-13 16:13:27 -08:00
Jason Juang
d8f3fffd5e change compile order to debug first, fix #2767 (#2785) 2018-02-13 00:00:27 -08:00
Robert Schumacher
73e45b0ce2 [qt5-base][qtdeploy] Deploy plugin dependencies to the executable's folder. 2018-02-08 13:25:45 -08:00
Robert Schumacher
1e3435e32b Merge branch 'master' of https://github.com/Microsoft/vcpkg 2018-02-07 17:47:53 -08:00
Alexander Karatarakis
3aac3957ae [vcpkgInvokeCommandClean] Don't use -encodedCommand.
Instead, use -Command with the appropriate number of escaped quotes
(which ended up being 3)
2018-02-07 17:31:30 -08:00
Alexander Karatarakis
815e3caf55 Merge findFileRecursivelyUp into VcpkgPowershellUtils 2018-02-07 17:31:30 -08:00
Robert Schumacher
116914e110 [vtk] Fix breaking change in find_package(HDF5) 2018-02-07 17:10:43 -08:00
Robert Schumacher
676c861ae6 [curl] Add nghttp2.lib to dependencies of curl 2018-02-07 17:03:14 -08:00
Robert Schumacher
71025694e9
[vcpkg-configure-cmake] Use ninja to configure in parallel (#2712) 2018-02-07 16:57:47 -08:00
Alexander Karatarakis
c9d434dfbc vcpkgRemoveItem: nullcheck 2018-02-06 15:36:16 -08:00
Neil McNeight
f136732dcd
Fix for Issue #2729
Allows PowerShell to change the name of the downloaded directory correctly.
2018-02-06 15:26:06 -06:00
Robert Schumacher
d385e296a6 [hdf5] Always use config mode for HDF5 2018-02-05 17:50:16 -08:00
Robert Schumacher
1f6f27a548 [vcpkg-from-bitbucket] Fix HEAD builds. Fixes #2696. 2018-01-31 11:50:50 -08:00
Alexander Karatarakis
2bc105cd95 Add vcpkgFormatElapsedTime in powershell side 2018-01-30 14:42:33 -08:00
Alexander Karatarakis
6c0f3a8859 [ClearEnvironment] Fix registry comments 2018-01-27 22:08:07 -08:00
Alexander Karatarakis
e9b0de9d68 Add -NoProfile and -ExecutionPolicy Bypass in powershell call 2018-01-25 17:27:43 -08:00
Alexander Karatarakis
186a2cf88b [bootstrap] Fix whitespace issue 2018-01-25 17:03:37 -08:00
Alexander Karatarakis
6e07cbeff4 [bootstrap] Specify full path for dirs.proj 2018-01-25 16:48:32 -08:00
Alexander Karatarakis
edcc8e2c36 [bootstrap] Exit fast(er) if msbuild fails 2018-01-25 14:57:53 -08:00
Alexander Karatarakis
89addaa7a5 VcpkgInvokeCommand: return the error code 2018-01-25 14:57:26 -08:00
Alexander Karatarakis
a8a20f1a13 VcpkgInvokeCommand: remove paramter $wait 2018-01-25 14:46:00 -08:00
Alexander Karatarakis
fd2f9816cc Don't expand variable 2018-01-24 15:22:41 -08:00
Alexander Karatarakis
e5b0de35d3 [vswhere] Update to 2.3.2 2018-01-23 15:08:52 -08:00
Alexander Karatarakis
0df743d625 [bootstrap] Build vcpkg in a clean environment 2018-01-23 14:16:06 -08:00
Alexander Karatarakis
a5fe308ea3 $script:MyInvocation.MyCommand.Definition
It works also in cases where scripts/functions are calling each other.
Without the $script prefix, it would instead give you the calling function OR the path if there was no parent function.
With the prefix, it always yields the directory of the script
2018-01-23 14:16:06 -08:00
Alexander Karatarakis
62c8626f4d vcpkgInvokeCommand(): Add -NoNewWindows flag 2018-01-23 14:16:06 -08:00
Alexander Karatarakis
ae582e0d4f [bootstrap] Extract arguments in variable 2018-01-23 14:16:05 -08:00
Alexander Karatarakis
3332326c65 Update CMake to 3.10.2 2018-01-23 14:16:05 -08:00
Alexander Karatarakis
2890ffa31c Don't print "downloading..." if file is already downloaded 2018-01-23 14:16:05 -08:00
Tsukasa Sugiura
64203615a6 Fix OpenNI2 deploy (#2627)
* Fix OpenNI2 deploy

Fix to deploy initialization file and drivers.

* [openni2] Adjusting deployopenni2.ps1 paths

* Fix Create Directory of OpenNI2 Drivers

Fix create directory of OpenNI2 drivers.

* Fix Deploy Script Path

Fix deploy script path.
2018-01-23 08:45:23 -08:00
Robert Schumacher
353d635b97 [freetype][harfbuzz] Fix static freetype dependency. 2018-01-18 10:57:30 -08:00
Robert Schumacher
d35866018a
Merge pull request #1993 from Barath-Kannan/qt5_modular
Qt5 modular
2018-01-18 10:51:18 -08:00
Robert Schumacher
b47b4346f8 [vcpkg-build-qmake][vcpkg-configure-qmake] Collapse config-specific versions. 2018-01-18 07:36:54 -08:00
Sean Warren
c1ba4eacc3 Generalise vcpkg_fixup_cmake_targets.cmake file to correctly detect dlib debug files (#2574) 2018-01-18 01:28:56 -08:00
Alexander Karatarakis
c7296cf1f2 [FetchDependency] Print out text when downloading/extracting 2018-01-17 17:34:41 -08:00
Alexander Karatarakis
81ab439b48 [VcpkgPowershelUtils] Inline variable 2018-01-17 17:34:41 -08:00
Alexander Karatarakis
3390007020 [powershell] Remove usages of BitsTransfer 2018-01-17 17:34:40 -08:00
Barath Kannan
c30363d07b Merge branch 'master' into qt5_modular 2018-01-17 19:00:43 +11:00
Cdec
3b3bff1824 [vcpkg_download_distfile] Change to refer _VCPKG_INTERNAL_NO_HASH_CHECK in parameter check 2018-01-14 12:49:04 +09:00
Stefano Sinigardi
bc70053ab7 use proper symbol to build correct configuration 2018-01-06 18:54:59 +01:00
Robert Schumacher
2b30280c22 [vcpkg-download-distfile] Regenerate docs and enable SKIP_SHA512 only in unstable (head) mode 2018-01-05 16:16:08 -08:00
Mikhail Paulyshka
42c0cfc870 [vcpkg] fix --head flag for github-based ports 2018-01-05 15:47:17 -08:00
Robert Schumacher
cf802347a4
Merge pull request #2218 from jasjuang/llvm
[llvm] add in clang and enable tools
2018-01-05 15:37:14 -08:00
Robert Schumacher
0cf5bd657e [vcpkg-fixup-cmake-targets] Add TARGET_PATH option 2018-01-03 20:11:35 -08:00
Jacek Blaszczynski
a28138eb9e Add preliminary support for arm-windows and arm64-windows triplets (#2371)
* Add preliminary support for arm-windows and arm64-windows triplets

Visual Studio 15.4 shipped with new VC tools targeting arm and arm64
for desktop. This change allows for recognition and usage of new
triplets supporting arm and arm64 Windows desktop and server targets.

* Remove unnecessary changes

* Part 2

* Part 3

* Make detection of Arm64 _VCPKG_TARGET_ARCHITECTURE precise

* Enforce usage of Visual Studio CMake generatorfor arm and temporarily arm64 targets

* Address code review feedback, clean libjpeg-turbo port.cmake

* [libjpeg-turbo][tiff] Reduce changes to existing libraries.

* [vcpkg-cmake] Simplify toolchain selection logic and improve comments
2018-01-03 17:19:52 -06:00
Robert Schumacher
7f9ca12c4c [vcpkg-download-distfile] Fix #2426 2018-01-03 14:30:30 -08:00
Albert Ziegenhagel
43aec468a1 Remove workaround for a bug in FindMPI.cmake that was introduced in cmake 3.10.0 and fixed in 3.10.1 2018-01-03 10:58:59 +01:00
Albert Ziegenhagel
be5e529bb3 Update cmake to 3.10.1 2018-01-03 10:57:46 +01:00
Barath Kannan
d8f0ea9999 resolve merge conflicts 2017-12-27 16:57:43 +11:00
Robert Schumacher
a24ccdfc01 [vcpkg-build-cmake] Build at IDLE priority. Try to detect out-of-memory issues in the linker, and restart the build once. 2017-12-21 12:13:25 -08:00
Robert Schumacher
5e5506e68a [vcpkg-download-distfile] Add input sanitization 2017-12-21 03:47:02 -08:00
Tsukasa Sugiura
6cb6a61aaf Fix find Boost when can not be found Boost that installed with Vcpkg (#2395)
* Fix find Boost when can not be found Boost that installed with Vcpkg

Fix find Boost when can not be found Boost that installed with Vcpkg.
Re-find package Boost uisng user specified options.

* Fix regex of generators

Fix regex of generators.
Add ending position.

* Fix Save and Resore Boost_COMPILER

* [vcpkg-cmake-integration] Expand saved boost variables
2017-12-19 16:18:13 -08:00
Robert Schumacher
7e1a737ba4 [vcpkg-integrate-powershell] Fix $false bug. Fixes #2397. 2017-12-19 16:11:34 -08:00
Alexander Karatarakis
1656cf7fa7 [powershell] Use \ instead of / for paths. Resolves #2358. Resolves #2361 2017-12-12 17:53:29 -08:00
Robert Schumacher
4567fa5709 [vcpkg-cmake-toolchain] Mark _VCPKG_ROOT_DIR as INTERNAL 2017-12-09 17:25:12 -08:00
cDc
19860a0933 [tinyexif] add TinyEXIF library (#2221) 2017-12-09 00:24:19 -08:00
Robert Schumacher
3c2b2cc607 [vcpkg-cmake-toolchain]
Use list(APPEND) instead of set(). Fixes #2336.
Fix MPI issue introduced in cmake 3.10. Fixes #2317.
Add _VCPKG_ROOT_DIR to persisted variables to reduce disk access during cmake reconfigure.
2017-12-08 22:08:19 -08:00
Alexander Karatarakis
1f3013bea3 Improve vcpkgExtractFile. Also merge vcpkgRemoveDirectory/File 2017-12-08 15:16:35 -08:00
Ilya Finkelshteyn
e7cbb50f3d Fix path to powershell.exe
https://github.com/Microsoft/vcpkg/issues/2299
2017-12-05 15:22:21 -08:00
Robert Schumacher
a4f8515c9e [vcpkg-msbuild-integration] Address #2299 by using full path to powershell. 2017-12-05 15:22:21 -08:00
Alexander Karatarakis
d26a6b067c Add vcpkg integrate powershell for tab completion 2017-12-04 15:37:06 -08:00
Alexander Karatarakis
fdf7c65aa4 Exit early if no VS is found 2017-11-30 16:43:59 -08:00
Robert Schumacher
d38d4a7540 [vcpkg] Add --x-xunit internal command to print installation results in a VSTS friendly format. 2017-11-30 08:09:09 -08:00
Robert Schumacher
b4668e664a [vcpkg] Only default target triplet to windows if on windows 2017-11-28 13:17:10 -08:00
Alexander Karatarakis
b7c9ef5553 Don't return $destinationDir 2017-11-27 00:45:00 -08:00
Alexander Karatarakis
2c914ff05a Rework vcpkgExtractFile (powershell) 2017-11-27 00:42:39 -08:00
Alexander Karatarakis
c4c079f86e [VcpkgPowershellUtils] Minor tweaks 2017-11-27 00:42:39 -08:00
Mikhail Paulyshka
e009618ba0 [cmake] update to 3.10.0 (#2236) 2017-11-26 03:18:35 -08:00
Alexander Karatarakis
92872439b9 [fetchDependency[ Make parameter mandatory 2017-11-26 01:32:09 -08:00
Alexander Karatarakis
8883e40aaa vcpkgCreateDirectory->vcpkgCreateDirectoryIfNotExists 2017-11-26 01:31:58 -08:00
Robert Schumacher
14cbe496bc [vcpkg] Allow compilation inside WSL 2017-11-25 16:21:54 -08:00
Robert Schumacher
5335d17f53 [vcpkg] Initial experimental support for VCPKG_BUILD_TYPE release 2017-11-25 15:25:18 -08:00
Robert Schumacher
a3ea74b9ed
Merge pull request #2250 from AndyM84/master
Adding UnitTest++ Port
2017-11-25 12:48:07 -08:00
Robert Schumacher
89983fe102 [vcpkg-from-github] Improve argument handling 2017-11-25 12:47:49 -08:00
Robert Schumacher
141f10801c [vcpkg] Improve external toolchain handling. 2017-11-25 11:50:31 -08:00
Robert Schumacher
f7c10858f7
Merge pull request #1752 from martin-s/patch-vs2013
Added support for VS2013 build chain tools.
2017-11-21 21:47:51 -08:00
Robert Schumacher
eec26f68fc [qt5] Reduce duplication in modular build by extracting qt5modularscripts 2017-11-20 17:07:03 -08:00
Frank Quinn
7fc2d7dbdf Added SCONS to vcpkg_find_acquire_program
See: http://scons.org

I have a port I would like to submit which uses scons (which in
turn uses the python interpreter already provided). This change
makes SCONS usable for vcpkg_execute_required_process.
2017-11-19 11:42:52 +00:00
Alexander Karatarakis
6290155eaa [vcpkgExtractFile] Fix partial dir name. Special case 1-item zips
- If the zip contains a single item, pull that up a directory
- If the zip contains multiple items, place that in a directory on of the same name as the zip
2017-11-17 01:23:14 -08:00
Robert Schumacher
875bb9a661 Merge branch 'qt5_modular' of https://github.com/Barath-Kannan/vcpkg into Barath-Kannan-qt5_modular 2017-11-17 00:22:15 -08:00
Alexander Karatarakis
b2e1dc3e5a Use temp-and-rename pattern for extracting 2017-11-16 02:02:00 -08:00
Alexander Karatarakis
2abdcc1eec Introduce VcpkgPowershellUtils 2017-11-15 22:37:24 -08:00
Robert Schumacher
7e3dcc4f09 [tesseract] Fix static linking. [icu][tiff] Add patches in toolchain to fix static linking. 2017-11-15 21:58:26 -08:00
Robert Schumacher
4228e1e389 [llvm] Install debug targets for cmake 2017-11-15 21:15:37 -08:00
Robert Schumacher
24283ec1ee [leptonica][tiff] Add LZMA to tiff's dependent libraries. Leptonica should use TIFF_LIBRARIES. 2017-11-15 18:57:05 -08:00
Robert Schumacher
415789b42e [vcpkg-metrics] Replace SQM with MAC hash. 2017-11-13 21:49:11 -08:00
Robert Schumacher
50f6bc4e8f [vcpkg-toolchain] Fix find_package detection of Boost. Fixes #2130. 2017-11-10 17:34:00 -08:00
Alexander Karatarakis
cd41cfe468 Use Push-Location/Pop-Location instead of pushd/popd 2017-11-09 21:42:36 -08:00
Alexander Karatarakis
7eb0095094 Rename $explicitlyRequestedVSPath to $withVSPath 2017-11-09 21:41:16 -08:00
Alexander Karatarakis
615f7e112f [bootstrap.ps1] Add option to specify VS path 2017-11-09 20:09:22 -08:00
Alexander Karatarakis
eabacf0d14 Make parameter mandatory 2017-11-09 20:09:22 -08:00
Alexander Karatarakis
138bce34f2 Fix SHA-256 name 2017-11-09 20:09:22 -08:00
Robert Schumacher
2ece3186ff [vcpkg-build-msbuild] Update examples. 2017-11-08 10:41:03 -08:00
Robert Schumacher
d43676658a [vcpkg_from_github] Handle '/' in REFs. Fixes #2141. 2017-11-07 09:10:19 -08:00
Robert Schumacher
5743b68bc2
Merge pull request #2139 from UnaNancyOwen/fix_buildsystems
Reset settings to find boost libraries
2017-11-06 09:49:13 -08:00
Alexander Karatarakis
4bd9ad6969 [Get-(File)Hash] Use namespaces and add Pscx check 2017-11-05 18:10:48 -08:00
Alexander Karatarakis
524adf93aa [Expand-Archive] Use namespaces to distringuish Powershell 5's and PSCX's 2017-11-05 17:58:47 -08:00
Tsukasa Sugiura
07e4e674f0 Reset settings to find boost libraries
Reset the settings to find the boost libraries that installed by vcpkg.
vcpkg will always rename to Boost libraries name that able to be find
with default settings of FindBoost.cmake.
2017-11-06 04:33:35 +09:00
martin-s
d5a7da6bcb Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013
# Conflicts:
#	scripts/cmake/vcpkg_configure_cmake.cmake
#	toolsrc/src/vcpkg/vcpkgpaths.cpp
2017-11-05 19:13:16 +01:00
Barath Kannan
b959f70a99 merge from master 2017-11-06 00:33:04 +11:00