mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-24 05:48:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13,902 Commits 1 Branch 58 Tags 412 MiB
bdc8687f7c
Commit Graph

198 Commits

Author SHA1 Message Date
Sam Freed
ae991ee6ca Warn when unable to determine target architecture instead of error (#5188) 
* Warn when unable to determine target architecture instead of error

* Make the warning not appear multiple times

* fix multiple warnings for real
 2019-02-06 13:08:57 -08:00
Alexander Neumann
4f7d4dc66f Temp fix for #4359 (#4573) 
* make user wide integration not burn everything if LLVM is used as a toolset.
(e.g. cmake -G "VS" -TLLVM fails to even find compiler due to linker issues)
fixes #4359 but might have side effects for that toolset.
(e.g. not automatically adding dependencies)

* remove whitespaces

* [vcpkg-integrate] Conform to MSBuild conventions for comparisons
 2018-11-08 23:48:09 -08:00
Robert Schumacher
a1fe9544fd [qt5-base] Update qtdeploy.ps1 to generate qt.conf, qml, and qtquick. Fixes #2857. 2018-10-23 15:12:57 -07:00
Frederik Carlier
cc00cf05fb New packages: libimobiledevice, getopt, readline (#3504) 
* Add libplist

* Add libusbmuxd

* Fix typos

* Add getopt

* Add libimobiledevice

* Fix typos

* Add libideviceactivation

* Add ideviceinstaller

* Include utilities

* Install usbmuxd

* Add readline

* Fix readline on 64-bit windows

* Add libirecovery

* libideviceactivation: include tools

* Bump versions to fix build issues

* Bump versions

* Add idevicerestore

* [getopt][getopt-win32] Rename to getopt-win32 and only install on Windows Desktop

* [readline][readline-win32] Rename to readline-win32 and only install for Windows Desktop

* [vcpkg_from_github][vcpkg_apply_patches] Make PATCHES relative to the current port directory

* [vcpkg_install_msbuild][vcpkg_check_linkage] Introduce vcpkg_install_msbuild() and vcpkg_check_linkage().

* [libimobiledevice et al] Use vcpkg_from_github() and vcpkg_install_msbuild()

* [readline] Fix static builds
 2018-08-08 04:15:13 -07:00
Alexander Karatarakis
d84e86a910 Fix grpc lookup (case-insensitive) 2018-04-23 18:43:05 -07:00
Jonathan Hale
3a3fa5cd8f [magnum] Properly deploy plugins (#3191) 
* [magnum] Properly deploy magnum plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add tinygltfimporter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum][magnum-plugins] Add features: trade and any*

Prepares upcoming move of those sublibraries and allows building --head
immediately.
For current release this only adds some unused cmake flags that will be
ignored.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add gl feature, cleanup dependencies, mark upcoming features

And sort features alphabetically.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Prepare renaming of static flag for --head installs

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add two missing feature dependencies

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Enable magnum[any*] features by default

Signed-off-by: Squareys <squareys@googlemail.com>
 2018-04-18 19:33:12 -07:00
Robert Schumacher
35f5a0de53 [vcpkg-cmake-toolchain] Remove some hardcoded find_package helpers and guard all remaining ones 2018-04-05 21:39:47 -07:00
Alexander Karatarakis
f9d4692749 [vcpkg.cmake] Remove Windows SDK detection. Let cmake detect it 2018-03-29 21:14:06 -07:00
Robert Schumacher
c5f93055a0 [vcpkg-cmake-toolchain] Only wrap find_package(Boost) if a boost library is installed. 2018-03-14 09:58:23 -07:00
Robert Schumacher
7142a09344 [vcpkg] Improve non-Windows default triplet detection 2018-03-13 05:56:02 -07:00
Robert Schumacher
4338ae25a1 [vcpkg] Enable packages to provide cmake wrapper scripts. 2018-03-11 23:42:53 -07:00
Robert Schumacher
f56a5e4e94 [vcpkg] Improve defaults for other platforms 2018-03-11 23:42:53 -07:00
Robert Schumacher
8d70abd134 [libxml2] Fix vcpkg toolchain helper 2018-03-09 13:38:58 -08:00
Robert Schumacher
a759caf15e [gsl] Fix finding release libs in debug configurations. Fixes #2982. 2018-03-07 11:56:21 -08:00
Bruce Jones
ae1ce5aaa7 applocal-deps applied to MODULE_LIBRARY target too (#2972) 
* Fix for issue #2786

* [vcpkg-cmake-toolchain] Only applocal dependencies for shared libraries

* applocal-deps applied to MODULE_LIBRARY target too
 2018-03-07 10:17:52 -08:00
Viktor Gal
59795e2a8e add shogun 6.1.3 (#2977) 
* add shogun 6.1.3

* [shogun] Add additional dependencies, force static linking
 2018-03-07 09:56:59 -08:00
Robert Schumacher
bad51b0462 [vcpkg] Improve handling of external toolchain files 2018-03-02 09:25:32 -08:00
Robert Schumacher
e70250ca19 [vcpkg] Improve handling of HDF5 targets 2018-03-01 10:36:13 -08:00
Robert Schumacher
0334365f51 [vcpkg-cmake-integration] Warn if no packages are installed for the current triplet. 2018-02-23 16:50:32 -08:00
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
Robert Schumacher
73e45b0ce2 [qt5-base][qtdeploy] Deploy plugin dependencies to the executable's folder. 2018-02-08 13:25:45 -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
d385e296a6 [hdf5] Always use config mode for HDF5 2018-02-05 17:50:16 -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
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
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
Alexander Karatarakis
097626c317 Use /DEPENDENTS instead of /IMPORTS in applocal.ps1 2016-11-08 19:02:59 -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
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
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
d58f0c6680 [integration] Enable static lib integration. Also, detect .vcpkg-root 2016-10-31 13:32:58 -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
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