Commit Graph

138 Commits

Author SHA1 Message Date
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
81613fa0ff [vcpkg-toolchain] Improvements; add VCPKG_CHAINLOAD_TOOLCHAIN_FILE 2017-10-16 11:22:21 -07: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
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
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
3839b44d18 [vcpkg-cmake] Use Bypass to avoid mark-of-the-web issues in cmake toolchain. 2017-04-06 15:08:35 -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
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
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
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
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
Charles Barto
b25c13c155 made some qt5 fixes 2016-11-01 19:19:05 -04: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
Mårten Nordheim
1009cd47bb Use -noprofile to avoid loading powershell profiles 2016-10-11 15:51:42 +02: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
17b95eb28c Remove leading underscore in _VCPKG_TARGET_TRIPLET and add CACHE attribute 2016-09-29 14:58:09 -07: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
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
Alexander Karatarakis
ccca198c1b Initial commit 2016-09-18 20:54:03 -07:00