mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-03 08:49:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13,888 Commits 1 Branch 58 Tags 412 MiB
ad42c88e51
Commit Graph

137 Commits

Author SHA1 Message Date
Alexander Neumann
f8cfe6c164 Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES (#8533) 
* Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES

to respect already set values
closes #8506

* ws change to trigger full rebuild
 2019-12-20 12:20:31 -08:00
Don
c7542de3f3 Use CMAKE_TRY_COMPILE_PLATFORM_VARIABLES to propogate values (#5180) 
CMAKE_TRY_COMPILE_PLATFORM_VARIABLES is used when CMake 3.6.0 or higher
is encountered. For older versions the previous behavior emulating this
functionality is used.
 2019-09-23 13:43:52 -07:00
dan-shaw
0f3b6fc163 vs 2019 integration bug (#7623) 2019-08-12 14:41:53 -07:00
Thad House
94cf18d119 Fix vcpkg things 2019-05-31 13:50:30 -07:00
Thad House
788af2a75c Merge master 2019-05-31 13:49:13 -07:00
Alexander Neumann
bdb77a361c make regex case insensitive (#6402) 2019-05-24 16:35:40 -07:00
Sean Warren
84e19f1ce2 [vcpkg.cmake] Remove use of IN_LIST (#6521) 
Fixes regression introduced by #5681 in CMake projects with minimum version <3.3 where CMP0057 is not set to NEW
Fixes #6484
 2019-05-18 23:33:16 -07:00
Sean Warren
031e494970 Add mac applocal for bundling dependencies (#5681) 2019-05-16 13:24:02 -07:00
lukka
f2f31240a0 fix parens in cmake variable name (#6420) 2019-05-13 00:11:07 -07:00
Alexander Neumann
884bf46bf4 also ignore x86 openssl paths (#6416) 2019-05-12 18:37:02 -07:00
Thad House
d91644d3f5 Add support for CMake generation with VS 2019 (#6090) 2019-04-24 18:13:16 -05:00
Thad House
dd2100ee80 VS 2019 support 2019-04-14 11:09:32 -07:00
Thad House
73a99865b1 Add WPILib port for vcpkg 2019-04-14 11:09:32 -07:00
Damian Jarek
0e4c999b21 Fix installation failure when system Boost present (#5939) 
Boost 1.70 introduces "native" cmake config scripts which are
accidentally used when installing a vcpkg package. This only occurs
when Boost 1.70 is installed in the system when the user uses
`vcpkg install`.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
 2019-04-04 19:13:10 -07:00
Phil Christensen
d72e38036b
Merge pull request #5574 from Neumann-A/VTK_8.2.0 
[VTK 8.2.0/HDF5 1.10.5] Upgrade VTK and HDF5
 2019-03-14 23:12:31 -07:00
Alexander Neumann
1c7972a011 fix missing debug references in cmake generated (release) target files. 2019-03-14 22:24:29 +01:00
Stefano Sinigardi
0e77ca352e [tiff] use vcpkg wrapper for all configs, remove dead code (#5584) 
* [tiff] use vcpkg wrapper for all configs, remove dead code

* [tiff] update CONTROL
 2019-03-13 22:51:16 -07:00
Sean Warren
a9f8430961 [hdf5] Use cmake wrapper to ensure consuming libraries link to szip (#5467) 
* [hdf5] Use cmake wrapper to ensure consuming libraries link to szip in static build

* [hdf5] Move hdf5 cmake code from vcpkg.cmake to vcpkg-cmake-wrapper

* [hdf5] Do not force search in config mode

* [hdf5] balance needs of vtk and kealib
 2019-03-05 11:09:22 -08:00
Victor Romero
8641dfd9dd
Modify vcpkg_fixup_cmake_targets() (#5459) 
* some libraries export <PackageName>LibraryDepends.cmake
instead of <PackageName>Targets.cmake.
Those file also need the fix of #1044

should close #4753

* prefered the general solution #4622.
hopefully solved the issue within #4150
replaced the regex with something more readable
(also ident is lost)

should close:
#4753
#4633
#4150
and maybe more

* Hash vcpkg_fixup_cmake_targets.cmake

* [boost] Fix use of find_package(Boost) with cache variables
[socket-io-client] Fix install

* reversed change back to use regex replace

* [glbinding] Fix _IMPORT_PREFIX depth in *-export.cmake files

* [tinyspline] Ignore warnings treated as errors

* [libevent, liblemon, libpng, smpeg2, zlib] Fix apply patches

* [libsodium] Fix apply patches

* [folly] Link correct libraries in debug and release

* [vtk] Remove unset of _IMPORT_PREFIX

* [tinyspline] Do not treat warnings as errors

* [smpeg2] Fix double* to int comparison

* [nvtt] Define value for HAVE_UNISTD_H in MacOS

* [libui] Fix MacOS X build

* [zlib] Fix download URL

* [qhull] Update to v7.2.1

* [podofo] Set value for HAVE_UNISTD_H in MacOS

* [mongo-cxx-driver,ogre,podofo,qhull] Bump CONTROL version

* [mongo-c-driver] Set _IMPORT_PREFIX

* [tmxparser] Bump CONTROL version

* [qhull,vxl] Bump CONTROL version
 2019-02-28 23:53:42 -08:00
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 Karatarakis
d84e86a910 Fix grpc lookup (case-insensitive) 2018-04-23 18:43:05 -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
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
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
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
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