diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-03-31 20:54:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 11:54:44 -0700 |
| commit | 8646c6587b69b9294337c2034671b03da3d47291 (patch) | |
| tree | 6889cd2d61ea433bb3764dacea654f3c25a03364 /scripts/buildsystems | |
| parent | db1df24767ae50fdcd8229bc4ae37c672e2b3e53 (diff) | |
| download | vcpkg-8646c6587b69b9294337c2034671b03da3d47291.tar.gz vcpkg-8646c6587b69b9294337c2034671b03da3d47291.zip | |
[vcpkg/meson] fix some details (#15756)
* [vcpkg_install_meson] add bin to path to run code generators
* [vcpkg_configure_meson]
deactivate native compiler in cross builds
make x86 on x86_x64 a native instead of a cross build
(as long as we are not building for UWP)
* remove double spaces in _FLAGS
remove unnecessary comments
* change regex to take double - into account.
* add missing removal of multiple spaces back into the regex
* remove ws diff change
* remove ws to reduce diff
* Change macro to function
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* UWP is cross target.
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/meson/none.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/scripts/buildsystems/meson/none.txt b/scripts/buildsystems/meson/none.txt new file mode 100644 index 000000000..6dafc8090 --- /dev/null +++ b/scripts/buildsystems/meson/none.txt @@ -0,0 +1,19 @@ +# native file used to make the build machine compiler unusable + +[host_machine] +system = 'none' +cpu_family = 'none' +cpu = 'none' +endian = 'little' + +[properties] + +[binaries] +c = ['false'] +cpp = ['false'] +objc = ['false'] +objcpp = ['false'] +ar = ['false'] +pkgconfig = ['false'] +cmake = ['false'] +ninja = ['false']
\ No newline at end of file |