Commit Graph

94 Commits

Author SHA1 Message Date
Robert Schumacher
5414655ea4 [vcpkg] Fix regression introduced in 8dc2699e5d. Fixes #873. Fixes #871. Fixes #874. Fixes #876.
When using the toolchain file, VCPKG_TARGET_TRIPLET was not specified, which resulted in all libraries being built against x86-windows.
2017-03-31 00:35:40 -07:00
Robert Schumacher
a9a8772ad4 [vcpkg-configure-cmake] Rely on toolchain to provide CMAKE_PREFIX_PATH 2017-03-28 17:18:07 -07: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
fded520642 [vcpkg-qmake] Tidy qmake-based builds. Search for qmake.exe inside tools. 2017-03-20 16:20:02 -07:00
Alexander Karatarakis
e4d337cc96 Use -NoProfile when calling powershell 2017-03-15 16:25:06 -07:00
Alexander Karatarakis
fa4b4d48d9 Fix vcpkg_get_windows_sdk.cmake to properly handle space in path 2017-03-15 16:25:06 -07:00
Robert Schumacher
e91218e638 Merge pull request #790 from Mixaill/msbuild-platformtoolset
vcpkg_build_msbuild: add PLATFORM_TOOLSET property
2017-03-14 17:10:33 -07:00
Mikhail Paulyshka
c791d19bd1 vcpkg_configure_cmake: fix ARM configuring 2017-03-14 03:59:41 +03:00
Mikhail Paulyshka
b87c1c1bea vcpkg_build_msbuild: add PLATFORM_TOOLSET property 2017-03-14 02:18:23 +03:00
Robert Schumacher
26b9278a4c [vcpkg_build_msbuild] Perform a full rebuild by default. 2017-03-13 14:09:11 -07:00
Robert Schumacher
8fc1447da7 [vcpkg_build_msbuild] Default to overriding WinSDK version 2017-03-13 14:02:28 -07:00
Mikhail Paulyshka
cff0971773 vcpkg_build_msbuild: add TARGET_PLATFORM_VERSION property 2017-03-12 21:22:59 +03:00
Robert Schumacher
883b865f8e [vcpkg-configure-cmake] Alwasy set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP to TRUE 2017-03-06 10:35:03 -08:00
Robert Schumacher
2f8d8d8b18 [ffmpeg] Initial commit of version 3.2.4 2017-03-02 07:29:19 -08:00
Alexander Karatarakis
beb1250fe4 Improve functions that detect ProgramFiles in CMake 2017-02-24 15:02:10 -08:00
Robert Schumacher
7dd7490468 [vcpkg] Force JOM to be updated to 1.1.2 2017-02-23 03:29:25 -08:00
Robert Schumacher
fa3f9dd962 [opengl] Add -ExecutionPolicy Bypass when invoking powershell as a child
process.
2017-02-21 23:29:31 -08:00
Alexander Karatarakis
b831a7d9ee [find/acquire python] Update to v1.1.2 from v1.1.1 2017-02-21 19:39:53 -08:00
Alexander Karatarakis
4dc8f546f6 [find/acquire python] Use 32-bit versions and bump to latest patch version 2017-02-21 19:31:52 -08:00
Alexander Karatarakis
c44c085e8b Add vcpkg_get_windows_sdk.cmake 2017-02-21 18:09:32 -08:00
pravic
9aa7c944f2 Allow to use git.cmd in addition to git.exe
In respect of #682 and https://cmake.org/Bug/bug_relationship_graph.php?bug_id=9879.
2017-02-21 08:24:14 +03:00
Alexander Karatarakis
edec017ece Fix download of nasm. Resolves libjpeg-turbo build error 2017-02-14 19:20:13 -08:00
Alexander Karatarakis
da26d09716 Add functions to find Program Files folders on the CMake side 2017-02-14 17:29:47 -08:00
codicodi
b65ae7c277 tabs to spaces 2017-02-09 18:15:57 +01:00
codicodi
6ca475a5b4 add libepoxy 2017-02-09 18:13:52 +01:00
Robert Schumacher
116b1b8c66 Reorder path alterations to generally append instead of prepend.
This solves the issue where some software bundles (git) provide multiple executables in the same folder, which can override other desired programs (link.exe).
2017-02-08 17:39:31 -08:00
Robert Schumacher
4d43330241 Merge branch 'master' into codicodi-ninja-support 2017-02-08 15:24:59 -08:00
Robert Schumacher
f7dcbe97ff [vcpkg] Disable Intel MKL for all internal builds. Fixes #609. 2017-02-03 17:46:09 -08:00
codicodi
95af9aac7c Add Ninja support 2017-02-03 17:16:13 +01: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
a3eaed8f1f [vcpkg] Add /MP to base compilation flags, enabling parallel builds. 2017-02-01 16:19:27 -08:00
Alexander Karatarakis
f2d40c5b81 Download 32-bit perl instead of 64-bit. Resolves #620 2017-02-01 11:38:58 -08:00
Alexander Karatarakis
8b602f97c8 [vcpkg_copy_pdbs] Force output to be in en-us. Resolves #587 2017-01-25 18:32:24 -08:00
Robert Schumacher
318d32e870 [vcpkg] Add user-facing notification to prompt rebuilding vcpkg.exe in face of cmake changes. 2017-01-24 18:55:41 -08:00
Alexander Karatarakis
93c3c0648a [VS2017] Enable building with v141 toolset 2017-01-23 19:25:47 -08:00
Robert Schumacher
2b48e78086 Merge pull request #529 from codicodi/add-glib
Add glib
2017-01-19 14:04:09 -08:00
Alexander Karatarakis
fd0adc561d [vcpkg_build/install_cmake] Add option to disable parallel building 2017-01-13 19:09:42 -08:00
codicodi
f5a0a64e44 [glib] tooools 2017-01-14 02:59:41 +01:00
codicodi
eb7ccc1223 Revert "[glib] use win_iconv and add subdir for tools"
This reverts commit ccd3e399f0.
2017-01-14 02:55:41 +01:00
Alexander Karatarakis
2bc4064b1e [vcpkg_build_cmake] Add option to specify the 64-bit toolset 2017-01-13 17:30:48 -08:00
codicodi
ccd3e399f0 [glib] use win_iconv and add subdir for tools 2017-01-14 02:15:34 +01:00
Alexander Karatarakis
f4622dce99 [7zip] Also consider the system version, if available 2017-01-11 20:54:25 -08:00
codicodi
275a59dd9d Add glib 2017-01-11 21:20:53 +01:00
Albert Ziegenhagel
1911fa8182 Acquire 7z
Since 7zip is distribute as installer only (no archive) we use msiexec to extract the installer without installing it. msiexec should be available on all windows computers (located in C:/Windows/system32)
2017-01-11 11:37:19 +01:00
Alexander Karatarakis
4f5f52ff47 Fix error message when looking for PYTHON2 2017-01-10 16:02:53 -08:00
Alexander Karatarakis
c5dad5306e [vcpkg_apply_pathces] Fix typo (also trailing whitespace) 2017-01-06 14:57:45 -08:00
Silvio
1decb1b52c cmake: add qmake-related helpers function 2017-01-05 23:46:43 +01:00
Silvio
f4c34bb42d vcpkg_apply_patches: add QUIET option 2017-01-05 23:46:43 +01:00
Robert Schumacher
31b713ca1f [vcpkg] Remove all instances of TRIPLET_SYSTEM_NAME; use VCPKG_CMAKE_SYSTEM_NAME instead. 2016-12-07 21:40:36 -08:00