Commit Graph

553 Commits

Author SHA1 Message Date
nicole mazzuca
1bb5ea10a3
[scripts-audit] vcpkg.cmake (#16061)
* [vcpkg.cmake] modify to get in line with the audit

See PR #16055

This also (attempts to) allow vcpkg.cmake to run with cmake 3.0; we had
a VERSION_GREATER_EQUAL check, but that if keyword was added in cmake
3.7.

* s/target_name/package_name in find_package

* depend on z_vcpkg_function_arguments

instead of a custom macro
also, as a drive-by, switch to foreach(X IN LISTS ...)

* split the utility macros/functions out

additionally, move the options and settings to the top of the file

* move more options and settings to the top

* fix name of file

* fix ras code comments

* remove z_vcpkg_utilities due to export
* add cmake_policy(PUSH|POP)
* add VCPKG_INSTALLED_DIR input variable
* add .cmakestamp to vcpkg_installed

* fix osx ifs to use quotes

also, remove spaces between if and (, to keep style consistent
(mostly for ease of grepping...)

* fix bug fixed by #16193

* move z_vcpkg_add_fatal_error up

* fix RANGE for reals
2021-02-18 16:27:47 -08:00
nicole mazzuca
f3a4d1aeb7
[scripts audit] ports.cmake (#16257)
* [scripts audit] ports.cmake

* [testing] modify triplet files to test all ports
2021-02-18 14:27:41 -08:00
nicole mazzuca
c3ef5d181b
[scripts-audit] vcpkg_add_to_path (#16189)
* [scripts-audit] vcpkg_add_to_path

* regenerate docs
2021-02-17 10:08:50 -08:00
nicole mazzuca
5f29a7a5ca
[scripts-audit] execute_process (#16190) 2021-02-16 11:41:36 -08:00
nicole mazzuca
6166e754fc
[scripts-audit] vcpkg_buildpath_length_warning (#16191) 2021-02-15 12:26:56 -08:00
ras0219
f79c681fc2
[vcpkg_install_msbuild] Hotfix regression in #16173 (#16199)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-02-12 23:42:22 -08:00
nicole mazzuca
8cff598ee5
[z_vcpkg_prettify_command_line] write to output variable (#16195)
* [z_vcpkg_prettify_command_line] write to output variable

* fix after testing
2021-02-12 17:53:17 -08:00
nicole mazzuca
b55a40d895
[scripts-audit] z_vcpkg_function_arguments (#16193)
* [scripts-audit] z_vcpkg_function_arguments

fix bug when ARGC = 0

* really fix the bug this time
2021-02-12 16:07:46 -08:00
ras0219
5e4d04ecd5
[vcpkg_build_msbuild] Hotfix regression in #16173 (#16180)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-02-11 10:09:36 -08:00
pastdue
d6105181a3
[vcpkg] vcpkg_configure_meson: Support macOS cross-compile (#15867)
* vcpkg_configure_meson: Support macOS cross-compile

* Update scripts/cmake/vcpkg_configure_meson.cmake

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* Use adapted regex instead, utilize for native file config as well

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
2021-02-11 00:44:49 -08:00
nicole mazzuca
545c165ce0
[(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (#16130)
* [vcpkg_prettify_command] Audit

* rename file

* rename out-var in docs

* fix file path

* add internal use message to docs

* escapin' in z_vcpkg_prettify_command_line

* regenerate docs
2021-02-09 15:53:36 -08:00
Stefano Sinigardi
d97ce7dfc2
[meson] fix single-config builds (#15937) 2021-02-01 19:27:34 -08:00
Charlie Barto
865de0c130
clarify the actions of vcpkg_check_linkage (#15832)
Co-authored-by: Charles Barto <barto.charlie@gmail.com>
2021-01-28 19:45:59 -08:00
pastdue
7115ef469d
vcpkg_configure_make: Support macOS cross-compile (#15659)
* vcpkg_configure_make: Support macOS cross-compile

* Move compiler flags logic to get_cmake_vars

* Better match the arch behavior of config.guess

* Apply suggestions from code review

Co-authored-by: Billy O'Neal <bion@microsoft.com>

Co-authored-by: Billy O'Neal <bion@microsoft.com>
2021-01-28 19:38:32 -08:00
Alexander Neumann
f2ec6c5a7c
[mpc/mpfr] Add new port / update mpfr (#13081)
* [mpc] add mpc port

* [mpfr] update mpfr to use make.

* [gmp] fix preprocessor define for dlls.

* more fixes

* fix mpfr regression on !windows

* install autoconf-archive in provisioning script

* change indent of patches

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* fix merge error

* update PR

* update baseline

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2021-01-24 23:01:16 -08:00
Jack·Boos·Yu
f0997d3f85
[msys2] Update msys components pkgconfig url (#15732)
* [pkgconfig] Update msys components pkgconfig url

* update hash
2021-01-22 10:45:08 -08:00
Billy O'Neal
4d136ef25f
[vcpkg] Add vcpkg_minimum_required as a replacement for VERSION.txt. (#15638) 2021-01-20 12:07:41 -08:00
pastdue
3912524298
[vcpkg baseline][vcpkg_configure_make] Fix arm64-windows, arm-uwp (#15740)
* [vcpkg_configure_make] Fix arm64-windows

* [vcpkg_configure_make] Fix arm-uwp
2021-01-19 19:40:30 -08:00
Alexander Neumann
e51da1b1b9
[vcpkg_acquire_msys] add findutils as a dependency to libtool (#15611) 2021-01-16 20:08:35 -08:00
Alexander Neumann
af3c99bc65
[vcpkg_build_make] remove libtool artifacts (#15622) 2021-01-16 19:53:05 -08:00
Stefano Sinigardi
f89336d703
[libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (#15089)
* [tesseract] add missing reference for downstream projects

* [tesseract] restore ci, fix many regressions that are uncovered by that

* Update ports/opencv2/CONTROL

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [opencv] fix regressions on uwp, accept failure on arm64 for now

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [opencv4] allow failures on all arm windows targets, both win32 and uwp

* adopts hints from #15180

* [libarchive] bump control version

* [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided

* enable features to be visible in parent scope

* apply documentation fix from CI

* [libarchive] remove unnecessary lines in portfile

* fix regressions

* Update ports/gdcm/CONTROL

* use more compact logic syntax

* add new versions to baseline

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-01-16 19:26:38 -08:00
Alexander Neumann
6f593eb61e
don't change line endings on patching. (#15578) 2021-01-14 14:51:36 -08:00
Rich Logan
fd67439f01
[tool-meson] Rev vcpkg's meson build (#15200) 2021-01-13 16:22:54 -08:00
Andrei Lebedev
557ecbe253
[vcpkg] use VCPKG_ROOT_DIR instead of DOWNLOADS for WORKING_DIRECTORY in do_version_check (#15299)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
2021-01-12 19:49:40 -08:00
Alexander Neumann
9c63f97fa1
[mesa] new port (#14640)
* [mesa] new port

* make mesa build more.

* more fine tuning

* fix x86

* add supports.

* comment about EGL feature.

* apply suggestion from CR.
added opengl feature.
error on disabled shared glapi if multiple GL APIs are selected.

* fix boolean option

* make sharedgl-api=true the hardcoded default

* add suggestion from CR

* add mesa:x64-windows-static=fail to ci.baseline.txt due to static crt and parts being a dynamic library.

* apply CR sugesstion

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-01-11 16:12:01 -08:00
RonxBulld
c7e96f2a5b
Show the cache file name at download time to provide more ancillary information in non-ARIA2 mode. (#15538) 2021-01-11 09:16:32 -08:00
Alexander Neumann
0b16dbc1cf
[vcpkg_from_git] new options TAG and X_OUT_REF (#15049)
* [vcpkg_from_git] new options TAG and OUT_REF
- TAG github tag to checkout
- OUT_REF github commit id related to tag or ref
(useable for automatic updates of ports if used with a version tag)

* Apply suggestions from code review

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* additional changes due to CR

* regenerate docs

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-01-11 00:27:56 -08:00
Schwarzer
122ab57da2
Update vcpkg_download_distfile.cmake (#15435)
Provide proxy setting instruction for more compatibility.
2021-01-05 12:39:57 -08:00
Takahiro Ueda
41e5b0815f
[docs] fix "CMake script" -> "makefile" for vcpkg_(n)build_make (#15419) 2021-01-05 12:37:19 -08:00
dweckmann
e2d3408547
[cppunit] add linux support and bump version to 1.15.1 (#15018) 2020-12-28 19:35:08 -08:00
dweckmann
f7e746dcae
[qt5] Fix linux dynamic build (#15005) 2020-12-21 11:17:30 -08:00
Adam Johnson
bdb225bc68
[python3] Build interpreter (#14891) 2020-12-18 12:00:45 -08:00
Leonid Pospelov
f78ccd9f0e
[mongo-c-driver] Fix Git too long path error with -c (#14825)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-12-15 14:37:00 -08:00
ras0219
dd4421808c
[vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (#13126) 2020-12-07 18:17:19 -08:00
Joël Thieffry
066c6fd712
[ NASM ] Update version from 2.14.02 to 2.15.05 (#14970)
* Bump NASM version from 2.14.02 to 2.15.05

The previous version is not available anymore at https://fossies.org/windows/misc/nasm-2.14.02-win32.zip .
libjpeg-turbo builds fine now.

* [freetds] Disable parallel configure

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-12-07 08:34:47 -08:00
nicole mazzuca
ef0c3036fc
[vcpkg baseline][vtk-m] fix the sha512 (#14884)
* [vtk-m] fix the sha512

* Bump version

* add FILE_DISAMBIGUATOR to vcpkg_from_gitlab

* actually use the file disambiguator

* regenerate docs

* [moos-core] Add DISABLE_PARALLEL_CONFIGURE

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2020-12-03 13:24:26 -08:00
Long Nguyen
02f6b89775
[many ports] mingw support (#14556)
* [vcpkg_configure_make] Only rename import libs on MSVC

* [x264] Only rename import libs on MSVC

* [x265] Add libc++ and libstdc++ as system libs

* [ffmpeg] mingw support

* [libvpx] Set AS environment variable

* [vcpkg_common_definition] Fix a mistake in the prefix and suffix variables

* [vcpkg_configure_make] Strip leading -l from lib list before joining

* [mp3lame] Use vcpkg_configure_make + mingw support

* [x265] Escape the pluses

* [ffmpeg] Add compiler flags for mingw

* [ffmpeg] Add WINVER define in mf_utils.c

* [ffmpeg] Remove unnecessary patch in 0003-fic-windowsinclude.patch

* [mp3lame] Add missing dollar sign

Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>

* [x265] Remove static lib when building shared with mingw

* [libogg] Change library name to libogg on mingw

* [libogg] Bump port version

* [x265] Remove -l(std)c++ flag in pkgconfig file

* [vcpkg_configure_make] Try to fix huge diff

* [mp3lame] Add comment on deprecated function lame_init_old

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-12-01 14:13:58 -08:00
nicole mazzuca
6b117c9c7e
[vcpkg docs] Check for documentation generation in CI (#14614)
* [vcpkg docs] Change how documenting port functions works

Instead of using `##`, use comment blocks for documentation.

Also, add some minor docs and change RST -> MD
so we actually get docs generated.

* add CI stuff

* regenerate docs

* fix vcpkg_find_acquire_program to not use _execute_process
2020-12-01 13:37:26 -08:00
yurybura
e95a7a8dc0
[llvm] update to 11.0.0 (#13998)
* [vcpkg] allow to use semicolons in COMMAND argument

* [llvm] update to 11.0.0

* [vcpkg] use latest version

* [vcpkg] allow to use semicolons in OPTIONS

* fix vcpkg_fixup_cmake_targets

* [llvm] fix more install paths, add /bigobj option, fix up CMake targets

* Apply suggestions from code review

* [llvm] fix clang, flang, lld, mlir and polly CMake targets

* [llvm] remove empty include directory /include/flang/Config

* [llvm] Flang requires C++17

* [llvm] add /Zc:__cplusplus

* [llvm] remove empty include directory include/clang-tidy/plugin

* [llvm] try to fix ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. with patch

* [llvm] set tools install dir to tools/llvm

* [aws-sdk-cpp] fix build after changes in vcpkg_configure_cmake.cmake

* [llvm] disable Flang and OpenMP on Windows

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-30 09:56:22 -08:00
ras0219
7c08030982
[vcpkg_apply_patches] Work around /etc/gitconfig: Permission denied (#14848)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-11-30 09:50:42 -08:00
Alexander Neumann
e2ec3b25e3
[vcpkg_fixup_cmake_targets] Add NO_PREFIX_CORRECTION (#12215)
* [vcpkg/scripts/fixup_cmake] add option NO_PREFIX_CORRECTION to not apply the

* add a bit of explanation why the prefix correction might be incorrect.

* apply the if only around the import prefix changes

* Update scripts/cmake/vcpkg_fixup_cmake_targets.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-11-25 12:06:25 -08:00
LRFLEW
38752e29c2
[vcpkg_find_acquire_program] Use OS-included Python 2.7 on macOS (#14662) 2020-11-23 16:18:51 -08:00
Jack·Boos·Yu
5cd25eee5d
Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt (#8524)
* add option PREFER_NMAKE to vcpkg_build_qmake and install_qt.

* Add /MP to qt5-base/vcpkg_build_qmake.

* use VCPKG_QMAKE_USE_NMAKE instead of as function parameter.

* Update ports/qt5-base/cmake/install_qt.cmake

* Update scripts/cmake/vcpkg_build_qmake.cmake

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-11-23 15:26:01 -08:00
Joakim L. Gilje
d9633d939c
[vcpkg] initial openbsd (community) support (#14549)
* initial openbsd support in vcpkg

* after clang-format

* hardcoded in the preferred compiler for openbsd in bootstrap scipt (thanks @tormfinn)

* Fetch a patched pkg-config because openbsd pkg-config lacks {fcfiledir}

* fixes from review feedback

* corrected hash for pkg-config.openbsd

* re-added missing endif()

* regenerate docs

* Update scripts/cmake/vcpkg_configure_meson.cmake

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-23 09:43:23 -08:00
Matioupi
878d7ea830
[curl] Fixes pkgconfig configuration file (#14350)
* Fix pkgconfig for windows debug build. Re-allow tool feature on non windows platforms

* Fix tool feature

* Modified debug/release prvate libs according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520444862
Added vcpkg_fixup_pkgconfig() according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520435718

* Delete portfile.cmake.orig

* Fix pkgconfig

* Revert "Fix pkgconfig"

This reverts commit cb4da8bcc5.

* Bump port version to 3

* add missing system libs for windows. made case type coherent for ws2_32

* Fix build on x64-linux triplet

* Reverted ws2_32 to Ws2_32 as discudssed in https://github.com/microsoft/vcpkg/pull/14350#discussion_r525893479

* More fixes for Linux build with features

* Fix for feature c-ares

* Formatting

Co-authored-by: Phoebe Ma <v-phma@microsoft.com>
2020-11-20 12:18:17 -08:00
Jack·Boos·Yu
fdfe770571
[gdal] Update to 3.1.3 (#13449)
* [vcpkg_*_nmake] Add option INSTALL_COMMAND

* [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows

* [vcpkg_build_make] Add option MAKEFILE

* fix install on windows, fix linux build

* fix options position

* [gdal] Fix linux build

* [gdal] Fix expat library name

* [gdal] Fix geos library name

* [gdal] Fix cmake wrapper

* [pdal] Fix dependency geos

* [pdal] Fix PDALConfig.cmake

* [gdal] Fix dependency cfitsio on *inx

* disable cfitsio temporary

* [gdal] Correct cmake wrapper and usage

* [gdal] Fix tools on windows-static

* Revert a9ac823007

* Apply suggestions

* [vcpkg_build_nmake] Fix install command

* [vcpkg_build_nmake] Fix install command

* regenerate docs

* [gdal] Update dependency iconv and charset library names

* [gdal] add json-c as a dependency on non-windows

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-20 10:29:25 -08:00
Adam Johnson
46068e8a37
[python3] Upgrade to 3.9.0 (#14510)
* [python3] Bump to 3.8.6.

* [python3] Bump to 3.9.0.

* [itk] Correct python artifact names.

* [pybind11] Update python artifact names.

* [vcpkg_find_acquire_program] Bump PYTHON3 to 3.9.0.
2020-11-20 09:44:51 -08:00
Christophe Calmejane
ef77f3c99f
[vcpkg android] Fix for issue #11927 (#14625)
Allow selection of Android SDK platform version from triplet file.
2020-11-18 15:45:05 -08:00
Alexander Neumann
3217e25596
[meson|scripts] update scripts (#12945)
* Update meson to a recent commit to fix a bug with 0.56

* rename static libraries built by meson by default on windows

* apply cmake variables detection to meson.
use native/cross files
make arm builds work.

* update munit

* fix fribidi

* fix _FLAGS variables

* set env SDKROOT and MACOSX_DEPLOYMENT_TARGET in configure_meson

* need osx env while building and configuring

* - remove unused env backup functions
- rename internal functions to be prefixed with _vcpkg_
- fix VCPKG_CHAINLOAD_TOOLCHAIN_FILE for ios/freebsd

* replace _vcpkg with vcpkg since _ has special meaning in functions

* rename functions to vcpkg_internal_meson_generate

* update control tool-meson
2020-11-18 13:36:20 -08:00
Alexander Neumann
79d9a154d9
fix single configuration make builds. (#14580) 2020-11-17 09:26:16 -08:00