Commit Graph

122 Commits

Author SHA1 Message Date
Alexander Neumann
ed0df8ecc4 Make VS 2019 default to x64 (#9816)
Since CMake also does this
2020-01-24 12:26:35 -08:00
Alexander Neumann
504eeea514 Map MinSizeRel and RelWithDebInfo correctly (#6393)
* Map MinSizeRel and RelWithDebInfo to Release by default

* switch to CMAKE_CONFIGURATION_TYPES

* changed mapping slightly

* add empty list element to the mapping

* more comments and an option to turn verbose messages on.

* removed line info.
It would require the file name to make sense out of it.
2020-01-09 15:26:27 -08:00
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
crusader-mike
126812d18b Resolves "project is never up-to-date" problem (issue 6179) (#7322) 2019-07-22 10:47:57 -07:00
shadowxiali
555b760c67 Update applocal.ps1 (#4942)
* Update applocal.ps1

* Update applocal.ps1

Fix Microsoft#2801,
prev modify mistake UTF8 to UTF

* Update applocal.ps1

in win7 chinese path, must utf8 to avoid copy dll fail
2019-06-12 17:41:28 -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
SvenPStarFinanz
7859944528 Overwriting dlls in the destination output directory when the source … (#4796)
* Overwriting dlls in the destination output directory when the source is newer.

* [vcpkg] cleanup whitespace
2019-02-28 13:52:51 -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 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