Commit Graph

385 Commits

Author SHA1 Message Date
Alexander Neumann
f8165f7270 [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI (#9260)
* Fix static qt5 builds and ignore system qmake
closes #9234 and #9239

* fix angle conflict and icu dependency

* add egl-registry as a dependency

* remove space

* adding spaces resolved the problem

* move files only if they exist

* Update the Wrapper to use the Postgres target

fixes some observed linkage issues

* update baseline

* add fontconfig on linux so CI is less flaky in a full rebuild

* fix linkage dependent qt5-imageformats libs

* Fix Wrapper for Linux and add other platform libs to Qt5::Core

* fix plugin properties in cmake files

* fix cmake files.

* fix missing plugin qminimal deployment into tools dir

* change wrapper slightly

* UNIX also means APPLE so it needs to be excluded

* fix the static windows build

* mark the parts of fixcmake which require further work to work with single configuration builds

* Update ci.baseline.txt

make qt5-tools pass for CI testing

* fix last regression

* break auto fontconfig in configure script to fix qt5-tools

* update baseline

* enable verbose to debug ci

* try to help it instead of breaking it

* completly link icu

* try to fix fontconfig configure

* fix configure call. cannot be called with a list!

* remove invalid line from patch

* force icu and reduce the required icu libs according to the configure script

* fix icu linkage

* add more icu dependencies and names for windows

* add more icu libs. Seems like all are needed

* fix typo

* print icu libs in debug

* check releasenames

* try again

* change link order

* add icu to wrapper

* fix typo

* patch icu configure for static windows builds

* add other icu libraries to the icu patch

* fix icu in x64-windows-static

* update baseline. VTK builds in local WSL so it should work in CI

* update VTK control to force rebuild

* remove qt5-tools=pass from baseline

* remove qcustomplot:x64-linux=fail from baseline

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-01-06 12:36:51 -08:00
Robert Schumacher
c0d22c88ea
[vcpkg_install_qmake] Add vcpkg_install_qmake (#9412)
* [vcpkg_install_qmake] Add vcpkg_install_qmake and convert existing ports to use it.
[vcpkg_configure_qmake] Add 'staticlib' to CONFIG in static builds

* [vcpkg_configure_qmake] Don't specify DESTDIR

* [libqglviewer][vcpkg_configure_qmake] Add staticlib CONFIG only for libqglviewer

* [qt5-base] Increment version to track changes in vcpkg_configure_qmake()
2019-12-23 06:10:12 -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
Robert Schumacher
ffed695062
[libxslt] Fix writing to locations outside vcpkg in Windows builds (#9242)
* [libxslt] Fix writing to locations outside vcpkg in Windows builds

* [libxslt] Add passing arm64-windows to baseline
2019-12-07 05:50:24 -08:00
Laurent Rineau
767909ad14 [vcpkg_find_acquire_program] Give hints for yasm with brew and apt (#9191) 2019-12-06 16:01:12 -08:00
Tatsuro Shibamura
227d055359 [ffmpeg] Fixed build error ARM64 Windows 10 (#9160)
* [ffmpeg] Fixed build error ARM64 Windows 10

* [ffmpeg] Avoid gas-preprocessor caching
2019-12-03 11:17:08 -08:00
Robert Schumacher
ae74e0bfd3
Merge pull request #5719 from donny-dont/github-url
[vcpkg_from_github] Allow targeting Github Enterprise instances
2019-11-22 15:13:08 -08:00
Robert Schumacher
45bc9e9848 [vcpkg_from_github] Rename GITHUB_URL -> GITHUB_HOST
Rename TOKEN -> AUTHORIZATION_TOKEN
2019-11-22 10:05:39 -08:00
Robert Schumacher
8831e8f25f
Merge pull request #7598 from Neumann-A/path_separator
[vcpkg] QoL: add host specific path separator to common definitions
2019-11-22 09:45:33 -08:00
Phoebe
9d1048e612 [libusb] upgrade and support arm64 (#8976) 2019-11-19 11:02:13 -08:00
JackBoosY
934275b712 [libxslt]Using vcpkg_install_nmake in Windows, support unix. (#8589)
* [libxslt]Using vcpkg_install_nmake in Windows, support unix.

* support PRERUN_SHELL/PRERUN_SHELL_DEBUG/PRERUN_SHELL_RELEASE

* Re-trigger CI.
2019-10-29 23:23:36 -07:00
Wolfgang Stöggl
af55822ea1 mesonbuild - Update to 0.52.0 (#8639)
* mesonbuild - Update to 0.52.0

* [tool-meson] Add package to represent dependency on Meson build-system
2019-10-28 15:47:40 -07:00
JackBoosY
1bdb6bfec1 Fix separate make and install execution error issue. (#8540)
* Fix separate make and install execution error issue.

* trigger CI system.

* Fix multiple copy files under debug, fix separator between make and install in linux.
2019-10-21 22:49:23 -07:00
JackBoosY
988b1c9897 support SKIP_CONFIGURE in vcpkg_configure_make. (#8647) 2019-10-21 16:23:52 -07:00
JackBoosY
b99d073412 Add AUTOCONF support with vcpkg_configure_make. (#8610) 2019-10-21 16:23:23 -07:00
Wolfgang Stöggl
6e30ee1ae8 vcpkg_configure_meson - Remove compiler flag /Oi (#8667)
Removing the compiler flag /Oi (Generate Intrinsic Functions) allows
meson to detect functions like memmove, memset correctly. This is
relevant to meson configure for fribidi (see fribidi/meson.build).

This fixes the following "issues" (from fribidi meson-log.txt):
  testfile.c(17): error C2168: 'memmove': too few actual parameters for
  intrinsic function
  Checking for function "memmove" : NO
  testfile.c(17): error C2168: 'memset': too few actual parameters for
  intrinsic function
  Checking for function "memset" : NO

And enables detection of the functions:
  Checking for function "memmove" : YES
  Checking for function "memset" : YES
2019-10-21 15:25:58 -07:00
Ehsan
6f37346354 [vcpkg_download_distfile.cmake] Fix Examples (#8669) 2019-10-21 15:25:25 -07:00
JackBoosY
37be706f56 Fix option -j (#8489)
* Remove unusable parameters -j

* trigger CI system.

* Add option -j to make.

* Re-trigger CI system.

* Fix -j in make, fix NO_DEBUG in nmake.

* Re-trigger CI system.
2019-10-09 05:54:19 -07:00
Stefano Sinigardi
726c111481 [vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
2019-10-07 10:35:13 -07:00
JackBoosY
ad493fd860 Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake (#8267)
* Add function vcpkg_configure_make/vcpkg_build_make.

* Fix autoreconf command and add log.

* Add vcpkg_install_make.

* Fix call function name.

* support non-debug mode.

* Add nmake support.

* [tcl]Add new port for testing.

* [vcpkg_configure_make]Fix prefix in linux.

* restart CI systen.

* Separate vcpkg_build_nmake/vcpkg_install_nmake. Add arg PROJECT_NAME.

* fix copy source file. add samples.

* Remove uncommon options.
Add force install para to autoreconf.

* fix build error.

* fix options judgment.

* enable nmake in windows.

* fix some envs and macros. Disable NMAKE in vcpkg_configure_make currently.

* update docs.

* fix environments.

* Modify libosip2 to use vcpkg_configure_make/vcpkg_install_make.

* [tcl]Tcl separates PR.

* trigger PR-EAGER.

* [freexl]Fix options name and remove option NMAKE.

* use tool-chain instead of set environments manually.

* fix autoreconf para.

* use vcpkg_execute_build_process instead.
2019-10-05 07:51:07 -07:00
Alexej Harm
da233c38ec Add go to vcpkg_find_acquire_program (#8440) 2019-10-04 11:14:35 -07:00
Vinny
5ebf65665d [Documentation] Added documentation page for vcpkg_fixup_cmake_targets.cmake (#8365)
* Added documentation page for vcpkg_fixup_cmake_targets.cmake, added example usage comment to .cmake file

* Update cmake_fixup_cmake_targets.md

* Update cmake_fixup_cmake_targets.md
2019-10-01 08:21:04 -07:00
Leonid Pospelov
6c7f1c7673 [vcpkg] Avoid RENAME usage to prevent cross-device link problems (#4245) (#8032) 2019-09-23 14:03:59 -07:00
Alexander Neumann
86a5b6fd7b [Qt] Fix static builds of qt5-imageformats (#8222)
* forward extra arguments to vcpkg_configure_qmake from submodules
* make image format dependent on tiff and libwebp
* make tools dependent on imageformat
* build options must be passed a bit different then normal qmake options
* add the required dependencies
* a new dependency discovered in qt5-declarative
* need webpdemux also
* qt5-declarative is dependent on imageformats so we can drop it here
* remove empty qt.conf if it exists. closes #8180
* add all recommended dependencies as dependencies in control.
2019-09-20 14:06:43 -07:00
Alexander Neumann
e2be4512a0 fixed leaking variable in vcpkg_build_qmake 2019-09-20 12:57:29 +02:00
Alexander Neumann
119e9b5729 update vcpkg_configure_cmake 2019-09-20 12:52:33 +02:00
Alexander Neumann
0c7bf66527 removed escaped version. added correct usage description 2019-09-20 12:52:14 +02:00
Alexander Neumann
5b1e426929 Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
#	scripts/cmake/vcpkg_common_definitions.cmake
2019-09-20 12:24:23 +02:00
Alexander Neumann
279e25aecf revert changes to vcpkg_build_qmake file 2019-09-20 12:20:21 +02:00
Alexander Neumann
8a44d47f76 [vcpkg] add missing implib definitions, fix shared lib extension on mac (#8131)
* [vcpkg] add missing implib definitions, fix shared lib extension on mac

(cherry picked from commit 2cddef9541)

* Better find_library suffixes and prefixes.

* moved additional suffix into a comment and reverted back to what is expected on windows

* updated documentation for add variables.
2019-09-16 09:06:06 -07:00
martin-s
191c864927 Fix bug in .vcpkg-root detection that breaks --overlay-triplets (#7954)
* - Added scripts variable to ports file.
- Added check if triplet file is not available (NPE).

* - Fixed line endings.

* Provide location of .vcpkg-root to ports.cmake

* vcpkg sets VCPKG_ROOT_PATH in ports.cmake

* [vcpkg] Fail if VCPKG_ROOT_PATH is not passed from vcpkg.exe

* [vcpkg] Fix vcpkg rooth path

* [vcpkg] Make --x-scripts-root an experimental command
2019-09-12 23:52:52 -07:00
Alexander Neumann
96f4487c77 [Qt] Update to 5.12.4 (#7667)
* update to 5.12.4
* removed port qt5-modularscripts and split it functionality into more functions into qt5-base
* added qt_port_hashes.cmake for simpler upgrade.
* added optional VCPKG_QT_HOST_MKSPEC and VCPKG_QT_TARGET_MKSPEC to select QTs build mkspecs from a triplet
* qt_<config>.conf are now copied from the build dir instead from the port dir
* fixed freetype dependencies.
* cleanup of vcpkg_qmake scripts. No strange/unclear replacements anymore.
* introduced vcpkg_buildpath_length_warning
* changed directory layout of the qt5 installation executables and mkspecs a bit.
2019-09-12 10:07:21 -07:00
Victor Romero
9e68729bb6
Use macro instead of function to override execute_process() (#7980) 2019-08-29 19:40:43 -07:00
Victor Romero
f5c732b40d
Download Mode (#7950)
* [portfile functions] Override execute_process() to accept ALLOW_IN_DOWNLOAD_MODE option

* [vcpkg install] Set VCPKG_DOWNLOAD_MODE when using --only-downloads option

* [vcpkg_find_acquire_program] Allow in Download Mode

* Don't stop when build fails for a package

* Download sources for all packages in dependency graph

* Improve output messages

* Enable acquiring MSYS packages in download mode

* Documentation

* Update documentation

* execute_process() always fails on Download Mode

* Regenerate docs and fix formatting

* Run clang-format

* Use _execute_process on vcpkg_from_<source> helpers

* Fix calls to _execute_process() when not in Download Mode
2019-08-28 13:49:29 -07:00
Victor Romero
4b404e8cfb
Revert "[vcpkg install] Enable Download Mode (#7797)" (#7949)
This reverts commit 65d4bc146b.
2019-08-28 11:59:30 -07:00
Victor Romero
65d4bc146b
[vcpkg install] Enable Download Mode (#7797)
* [portfile functions] Override execute_process() to accept ALLOW_IN_DOWNLOAD_MODE option

* [vcpkg install] Set VCPKG_DOWNLOAD_MODE when using --only-downloads option

* [vcpkg_find_acquire_program] Allow in Download Mode

* Don't stop when build fails for a package

* Download sources for all packages in dependency graph

* Improve output messages

* Enable acquiring MSYS packages in download mode

* Documentation

* Update documentation

* execute_process() always fails on Download Mode

* Regenerate docs and fix formatting

* Run clang-format

* Use _execute_process on vcpkg_from_<source> helpers
2019-08-28 11:47:17 -07:00
Alexander Neumann
d93b940b18
Merge branch 'master' into path_separator 2019-08-23 08:54:20 +02:00
Alexander Neumann
78abf650e7 [vcpkg] QoL: add host/target dependent variables for executable suffixes (#7599)
* improve documentation

* add executable suffixes for host/target into common definitions
2019-08-22 15:57:24 -07:00
Alexander Neumann
18d61a3fb1
Merge branch 'master' into path_separator 2019-08-21 12:00:35 +02:00
dan-shaw
0433989bad
[tensorflow] add new port for linux (#7568)
* [+] Add tensorflow-cc port (Linux only)

* [~] Refactor installation of tensorflow/external

  1. Install tensorflow/external to tensorflow-etc/external;
  2. Fix TensorflowCCConfig.cmake accordingly.

* [tensorflow] Work in progress

* fix tensorflow linux config

* [tensorflow] partial support for windows

* fix config paths

* use environmental variables instead

* remove files

* add python_path

* add verbose error messages

* review fixes

* [tensorflow] refactor config file

* minor changes

* set arch for CI
2019-08-20 12:13:26 -07:00
Alexander Neumann
743bec775a make find_library useable without errors to console. (#7773) 2019-08-20 08:34:18 -07:00
Alexander Neumann
70f4aabbe8
Merge branch 'master' into path_separator 2019-08-19 21:40:43 +02:00
Alexander Neumann
9c879883f6 add variables for target specific library suffix and prefix. (#7600)
also set the according cmakevariables in script mode
enabling find_library calls in portfiles
2019-08-19 11:13:30 -07:00
Victor Romero
a3a6530631
[vcpkg_check_features] Set output variable explicitly and allow reverse-logic check (#7558)
* [vcpkg_check_features] Set OUT_EXPAND_OPTIONS explicitly

* [vcpkg_check_features] Allow reverse logic for features

* [vcpkg_check_features] Document new parameters

* [vcpkg_check_features] Remove unnecessary logging

* Do not create variables for each feature only set OUT_FEATURE_OPTIONS

* Improve documentation

* Update ports that use vcpkg_check_features()

* Missing documentation updates

* [pcl] Fix tools feature

* [opencv,opencv4] Fix usage of vcpkg_check_features()

* [opencv4] Fix typo
2019-08-13 20:13:55 -07:00
Alexander Neumann
173642528e use vcpkg add to path in build scripts 2019-08-12 10:04:50 +02:00
Alexander Neumann
01e342d016 use VCPKG_HOST_PATH_SEPARATOR in scripts 2019-08-12 09:49:24 +02:00
Alexander Neumann
c4231c51e4 Merge remote-tracking branch 'upstream/master' into path_separator 2019-08-12 09:28:24 +02:00
Alexander Neumann
cabbe16525 [vcpkg/cmake] Added a function to fail from portfiles in a default way (#7601)
* added function vcpkg_fail_port_install to fail the portfile under requested circumstances and display a standarized failure message

* added always option.

* fix linux regressions

* bump control for ci tu rerun
2019-08-11 23:24:20 -07:00
Alexander Neumann
5899cd1d25 improve documentation 2019-08-08 14:40:47 +02:00
Alexander Neumann
b72fa4561f use it in vcpkg_add_to_path. 2019-08-08 14:22:53 +02:00