Commit Graph

24 Commits

Author SHA1 Message Date
Kai Pastor
39b548c8e5
[scripts|world rebuild] Always save config.log and CMakeCache.txt (#25189)
* Always save config.log, even on error

* Always save config.log and CMakeCache.txt[.log]

* Add SAVE_LOG_FILES option

* Make implicit lookups explicit

* Update versions
2022-07-07 14:58:03 -07:00
Juan Carlos Arevalo Baeza
61e686b24c
[vcpkg-cmake] Fix the application of VCPKG_CMAKE_CONFIGURE_OPTIONS with more than one option (#25123)
* Fix the application of VCPKG_CMAKE_CONFIGURE_OPTIONS with more than one option

VCPKG_CMAKE_CONFIGURE_OPTIONS (plural) is meant to be a list of options to be added to a cmake invocation.

But it was being applied quoted, which disallowed it from containing multiple options.
- If it was initialized with a list, cmake would get the options ";"-separated.
- If it was initialized with a blank-separated string, cmake would get the entire astring quoted as a single argument.

The fix is simple: don't (ever) quote arguments to list(APPEND) unless they are really meant to be a single element to append to the list.

* Update the version-date of vcpkg-cmake

* Update hash after rebase

* Fix vcpkg-cmake.json

In my defence, I'm new to this...

Co-authored-by: Juan Carlos Arevalo Baeza (JCAB) <jcab@ntdev.microsoft.com>
2022-06-20 13:58:43 -07:00
Robert Schumacher
7d2449c346
[docs] Delete embedded documentation in favor of docs/ (#25096)
* [docs] Delete embedded documentation in favor of docs/

Drive-by for the helper ports:
1. "documentation": "https://vcpkg.io/en/docs/README.html"
2. "license": "MIT"
3. Use `include_guard(GLOBAL)` in all script files
4. Make sure any persistent variables are saved to the cache

* [docs] Restore empty regenerate.ps1 to satisfy Azure Pipelines

* [docs] PR comments
2022-06-07 16:26:51 -07:00
Alexander Neumann
bae8f8c7d8
[world rebuild] Move vcpkg-cmake-get-vars to its own port (#24636)
* move vcpkg-cmake-get-vars to its own helper port

* manifest format

* version stuff

* doc and version stuff

* add missing include

* version bump

* remove coypright copying.

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
2022-05-11 16:51:06 -07:00
Nemirtingas
d5ea96667e
[vcpkg] Fix '/' incorrectly replaced by '-' on Linux. (#24098)
* Fix '/' incorrectly replaced by '-' on Linux.

* Update baseline.

* Use MATCHES instead of STREQUAL.

* Update version hash.

* Add comment for future modifications.

* Update version hash.

* Update version-date.

* Update baseline.

* Update ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt

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

* Update version.

* Run vcpkg format-manifest ports/vcpkg-cmake/vcpkg.json

* Run vcpkg x-add-version vcpkg-cmake

Co-authored-by: Nemirtingas <Nemirtingas@noreply.com>
Co-authored-by: Billy O'Neal <bion@microsoft.com>
2022-05-06 17:17:27 -07:00
Alexander Neumann
f7866c66d2
[vcpkg-cmake|cmake buildsystem] synchronize and sanitize scripts. (#23259)
* synchronize cmake build scripts.

* version stuff

* fix REMOVE_ITEM and add license

* format manifest

* update version

* use LOGFILE_BASE

* version update

* readd PREFER_NINJA and print a warning that it is deprecated for vcpkg_cmake_configure

* version stuff

* sync build_cmake

* only turn off ninja on windows

* add Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE

* use z_vcpkg_select_default_vcpkg_chainload_toolchain in meson

* remove VCPKG_CMAKE_GENERATOR

* version stuff

* reduce error to warning

* remove VCPKG_CMAKE_GENERATOR form configure_cmake

* version stuff

* version stuff

* use build_dir_<config>

* version stuff

* use ninja variable insead of pure ninja cmd

* version bump

* use ninja variable instead of calling ninja directly

* acquire ninja

* move the acquire.

* remove setting of cmake_prefix_path

* version stuff

* bump version date

* version stuff

* bump ashes baseline

* remove VCPKG_CMAKE_GENERATOR reference

* fix wrong variable reference due to refactor

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
2022-05-06 15:12:11 -07:00
Alexander Neumann
05c93c5c5a
[Fix uwp toolchain|world rebuild] make ninja work for uwp (#22831) 2022-04-27 18:12:48 -07:00
Kai Pastor
97b723c346
[vcpkg-cmake] Fix usage of CMAKE_CXX_COMPILER_TARGET (#24101)
* Guard CMAKE_CXX_COMPILER_TARGET

* Update versions
2022-04-18 16:45:15 -07:00
Alexander Neumann
c556911a79
[vcpkg] Refactor toolchain & generator selection (#23846)
* put default generator and toolchain selection into a function

* update version-date of script

* version stuff

* restore PREFER_NINJA behavior on windows
use elseif instead of else

* cr ws change

* missing ,

* version stuff

* CR scripts/cmake/vcpkg_configure_cmake.cmake

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* CR changes

* revert baseline

* update version

* bump version

* version stuff

* ci retrigger

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-04-11 15:57:36 -07:00
Christophe Calmejane
436d98da7f
[vcpkg CMake] Fix for #18529 that broke iOS compilation (#23989)
* Fix for #18529 that broke iOS compilation

Fix based on https://github.com/microsoft/vcpkg/pull/23001

* Updated version database
2022-04-06 16:05:16 -07:00
Robert Schumacher
54951282f3
[boost-modular-build-helper] Pass flags more correctly into b2 (#23001)
* [vcpkg-cmake][boost-modular-build-helper] Rework vcpkg_cmake_get_vars to produce fully cooked flags

* [ffmpeg] Fix arm-uwp builds

* [ffmpeg] Fix arm-uwp builds

* [ffmpeg] Fix arm64-windows

* [ffmpeg] Fix arm64-windows

* [ffmpeg] Update version after merge

* [boost-modular-build-helper] Add <linkflags> to requirements

* Address PR comments

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: Victor Romero <viromer@microsoft.com>
2022-03-30 14:52:25 -07:00
Kai Pastor
dd42206f86
[vcpkg-cmake] Remove cmake generator support restrictions (#22626)
* Stop failing in build step on unknown generators

CMake already completed configuration using the given generator.

* Support parallel build with Unix Makefiles

* Documentation fixes for vcpkg_cmake port

* `vcpkg_cmake_configure`: links to `opencv4` as example instead of
  `opencv` which is an empty port
* `vcpkg_cmake_install`: fix link to `vcpkg_cmake_build`'s docs
* `vcpkg_cmake_build`: fix link to `vcpkg_cmake_install`'s docs

* Extra script audit

* Update versions

* Regenerate docs

* [vcpkg-cmake] support Xcode parallel build

* no/parallel_args when CMake Generator is  "Xcode"

* Update versions

* CI

Co-authored-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
Co-authored-by: luncliff <dong-ha-park@linecorp.com>
2022-01-28 11:30:37 -08:00
Kai Pastor
c943da1f0d
[vcpkg-cmake] Fix parallel cmake (#22124)
* New version

* Refactor build dir setup

* Start parallel cmake from build directory

* Update versions

* [skip actions] CI
2021-12-30 09:45:20 -08:00
Kai Pastor
207af1c995
[vcpkg-cmake] Fix windows toolchain chainloading for uwp (#21857)
* Fix uwp toolchain chainloading

* Use common definitions

* Update versions

* [netcdf-c] Fix uwp compiler flags

* Update versions

* [skip actions] CI

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-10 13:55:24 -08:00
Phoebe
c592209c5f
[vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 (#19088)
* [vcpkg] Support VS2022 17.0

* small changes

* Update vcpkg.cmake

* Update the baseline version

* Update the baseline version

* Update the baselin version

* Adress the review suggestions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-13 20:10:12 -07:00
Jack·Boos·Yu
b7f99c3c4b
[vcpkg-cmake] Fix docs and usage of option MAYBE_UNUSED_VARIABLES (#19245)
* Remove unused cmake options and MAYBE_UNUSED_VARIABLES values

* Update MAYBE_UNUSED_VARIABLES docs

* update version

* version stuff

* version stuff

* update docs
2021-08-03 10:42:34 -07:00
nicole mazzuca
5304f826b5
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)

[scripts-audit] vcpkg_copy_tools and friends

* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)

[vcpkg] Fix toolchain compatibility with cmake < 3.15

* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)

[cmake-guidelines] Minor update, for `if()`

* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)

[scripts-audit] vcpkg_check_linkage

* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)

[vcpkg.cmake] Fix variable case.

* [rollup:2021-07-26 6/6] PR #18839

[scripts-audit] z_vcpkg_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-07-29 09:47:35 -07:00
nicole mazzuca
0e1dc12185
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)

[vcpkg-cmake] Add check for unused cmake variables

* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)

[vcpkg_list] add new function

* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)

[scripts-audit] vcpkg_build_ninja

* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)

[scripts-audit] vcpkg_minimum_required

* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)

[scripts-audit] vcpkg_replace_string

* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)

[scripts-audit] windows scripts

* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)

[many ports] remove deprecated vcpkg_check_features call [1/5]

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-07-20 10:24:58 -07:00
Sander Cox
fad4d8eecc
[vcpkg] Expand Architecture list with escape chars (#18156)
* Expand Architecture list with escape chars

This expands the architecture lists with escape characters. When
building FAT binaries for macos using multiple architectures in the
values they need to be escaped otherwise they are passed on to CMake
incorrectly #14932

* Adding the architecture fix to vcpkg-cmake port
updating port vcpkg-cmake version

* updated version in baseline
2021-07-01 09:21:55 -07:00
pastdue
38d2893b30
Add VCPKG_MAKE_CONFIGURE_OPTIONS (that can be set in the triplet) (#18132)
* Add VCPKG_MAKE_CONFIGURE_OPTIONS that can be set in the triplet

To append options to the configure command

* Add documentation

* Expand without quotes

Co-Authored-By: ras0219 <533828+ras0219@users.noreply.github.com>

* Add VCPKG_CMAKE_CONFIGURE_OPTIONS that can be set in the triplet

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

* Bump vcpkg-cmake port-version

* Run x-add-version vcpkg-cmake

* Apply suggestions from code review

* [vcpkg-cmake] add version

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-08 09:50:09 -07:00
Kai Pastor
5a271a9290
[doc] Fix spelling errors (#17560)
* [doc] Fix spelling errors in docs

* [doc] Fix spelling errors in scripts

* Bump version

* x-add-version

* Fix another typo

* Rebuild
2021-05-09 10:48:42 -07:00
nicole mazzuca
c8f6537b80
[ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (#16774)
* remove host-only nature of vcpkg-cmake-* ports

* versions

* fix fmt on uwp
2021-03-18 15:06:03 -07:00
Charles Milette
94db0dc3a0
[vcpkg-cmake] Fix typo in vcpkg_cmake_configure that prevented custom triplets from working (#16468)
* Fix typo in vcpkg_cmake_configure that prevented custom triplets from working

* Bump version

* Update baseline

* Update versions file
2021-03-01 11:49:24 -08:00
nicole mazzuca
3426db05b9
[scripts-audit] Rollup PR 2021-02-26 (#16440)
* [scripts-audit rollup] PR #16419

* pull the cmake doc comment parsing out into its own function
* support cmake helper ports
* add real support for deprecation, as opposed to ad-hoc

* [scripts-audit rollup] PR #16192

* add a z_ in front of internal functions
* move internal functions out

set feature_vars again in parent scope

* [scripts-audit rollup] PR #16309

Audit vcpkg_copy_pdbs

* [scripts-audit rollup] PR #16304

* Fix usage, documentation

* [scripts-audit rollup] PR #16393

* [scripts-audit rollup] PR #16377

Deprecate `vcpkg_*_cmake` in favor of `vcpkg_cmake_*` from the
`vcpkg-cmake` port, as well as `vcpkg_fixup_cmake_targets`
in favor of `vcpkg_cmake_config_fixup` from the
`vcpkg-cmake-config` port.
2021-02-28 13:17:19 -08:00