Commit Graph

73 Commits

Author SHA1 Message Date
Robert Schumacher 353d635b97 [freetype][harfbuzz] Fix static freetype dependency. 2018-01-18 10:57:30 -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
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
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 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
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
Robert Schumacher b4668e664a [vcpkg] Only default target triplet to windows if on windows 2017-11-28 13:17:10 -08:00
Robert Schumacher 14cbe496bc [vcpkg] Allow compilation inside WSL 2017-11-25 16:21:54 -08:00
Robert Schumacher 141f10801c [vcpkg] Improve external toolchain handling. 2017-11-25 11:50:31 -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 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 50f6bc4e8f [vcpkg-toolchain] Fix find_package detection of Boost. Fixes #2130. 2017-11-10 17:34:00 -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
Robert Schumacher 330b8d8bab [vcpkg-msbuild-integration] Output warning when configuration is not determinable. Add special cases for RelWithDebInfo and MinSizeRel. 2017-11-04 20:48:06 -07:00
Robert Schumacher 81613fa0ff [vcpkg-toolchain] Improvements; add VCPKG_CHAINLOAD_TOOLCHAIN_FILE 2017-10-16 11:22:21 -07:00
paercebal f1c6b5cd4b Enable tolerance for similar configurations 2017-08-12 10:57:56 +02:00
Robert Schumacher 4735040f66 [vcpkg] Hotfix for 63454f6189. 2017-07-28 16:46:57 -07:00
Robert Schumacher 63454f6189 [vcpkg-cmake] Always search for dynamic boost libraries 2017-07-28 11:45:06 -07:00
Robert Schumacher 6950aeb637 [vcpkg-applocal] Recurse into other binaries. Fixes #1435. 2017-07-13 17:47:20 -07:00
Robert Schumacher c21a2fe38a [angle] Add preliminary UWP support 2017-06-30 17:34:55 -07:00
Robert Schumacher 13b29588ba [vcpkg-cmake] Add tools subdirectories to the find programs path. Improves #1143. 2017-06-09 23:56:19 -07:00
Robert Schumacher 334a35e425 [vcpkg-toolchain] Compare CMAKE_SYSTEM_NAME, not WINDOWS_STORE. Fixes #1179. 2017-05-28 13:07:20 -07:00
Robert Schumacher 9c4099545b [vcpkg-toolchain] When using the Vcpkg toolchain, do not also include the user-wide property sheet. 2017-05-01 23:12:43 -07:00
Robert Schumacher ff639ecc02 [vcpkg-applocal] Ensure log for copied DLLs is created, even when no DLLs are copied.
This fixes a bug which caused all non-vcpkg-using builds to be considered out of date.
2017-04-25 17:49:13 -07:00
Robert Schumacher 89ad7d6b22 [vcpkg-toolchain] Add more CMAKE_SYSTEM_IGNORE_PATHs to suppress usage of system-wide openssl 2017-04-24 23:25:12 -07:00
Alexander Karatarakis 4d850d153a [vcpkg.cmake] Detect .vcpkg-root 2017-04-20 16:19:39 -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 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 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
codicodi 17c819c353 [vcpkg.cmake] handle alias executable targets 2017-03-28 19:08:30 +02: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
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 8b21933367 [vcpkg-msbuild] Add troubleshooting message to MSBuild projects with Importance=Normal 2017-01-31 17:53:08 -08:00
Robert Schumacher 33ce94a456 [vcpkg integrate] Exit silently if target cannot be found. 2017-01-24 15:17:45 -08:00
Robert Schumacher 44810f267d [vcpkg integrate] Lower verbosity of MSBuild messages. 2017-01-23 18:26:57 -08:00
Alexander Karatarakis 030ed27117 Fix integration when $(Platform) is empty 2017-01-19 17:38:56 -08:00
Robert Schumacher da09df713f [vcpkg integration] Explicitly skip empty entries instead of recursing. Fixes #460. 2017-01-13 17:39:12 -08: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 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 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