From a982079028f49c4a3464085f292eb6edf44ccec3 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Wed, 15 Jan 2020 04:25:32 +0800 Subject: [akali] Update to v1.41 (#9617) * Add: set(VCPKG_PLATFORM_TOOLSET v140) * add ppxbase and ppxnet. * nice, ppxbase and ppxnet can install successful. * update to v1.7 * + add duilib2 - update ppxbase, ppxnet. * set VCPKG_PLATFORM_TOOLSET to vc141. duilib2/ppxbase/ppxnet port. * library version. * duilib2, ppxbase version. * duilib2 version * update duilib2/ppxbase version. * update duilib2 code version. * update ppxbase version. update duilib2 version. * update ppxbase/duilib2 cmake config. * duilib2 version. * ppxbase version. * + add akali library. * update ports script. * ports update. * add akali * remove duilib2/ppxnet * revert * update akali version. * update akali version. * Update portfile.cmake * Update portfile.cmake * [akali] Update to v1.41 * Update portfile.cmake * [akali] Update version. * [akali] Remove the line akali:x64-osx=fail from /scripts/ci.baseline.txt --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 64969ecb5..7ad3e9c87 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -54,7 +54,6 @@ activemq-cpp:x64-windows-static=fail akali:x64-uwp=fail akali:arm-uwp=fail akali:arm64-windows=fail -akali:x64-osx=fail alac:arm-uwp=fail alac:x64-uwp=fail alembic:x64-linux=fail -- cgit v1.2.3 From fc5134c3a24a3622d0bc056d6bdd4c9a7c51a327 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Tue, 14 Jan 2020 12:28:06 -0800 Subject: [soem] Add new port (#9572) * initial SOEM port. * don't use the vendored winpcap. * removed the unused flag. * addressed feedback. * addressed feedback. --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7ad3e9c87..bc83397a0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1562,6 +1562,8 @@ smpeg2:x64-linux=fail smpeg2:x64-uwp=fail soci:arm-uwp=fail soci:x64-uwp=fail +soem:x64-uwp=fail +soem:arm-uwp=fail soil:arm-uwp=fail soil:x64-uwp=fail soil2:arm-uwp=fail -- cgit v1.2.3 From d989ad416b923a9f895c4bddc446d1ef370a3af8 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Mon, 30 Dec 2019 14:04:32 +0300 Subject: [gperf] Initial implementation (#9505) --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bc83397a0..2067b2983 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -554,6 +554,8 @@ googleapis:x64-uwp=fail google-cloud-cpp:x64-linux=ignore google-cloud-cpp-spanner:x86-windows=fail gppanel:x64-osx=fail +gperf:x64-uwp=fail +gperf:arm-uwp=fail graphicsmagick:arm64-windows=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail -- cgit v1.2.3 From 526f9375800f846b113989fc3d566af7b8c79408 Mon Sep 17 00:00:00 2001 From: tags Date: Thu, 16 Jan 2020 01:48:26 +0100 Subject: [doxygen] Updated to 1.8.17 (#9574) * Updated doxygen to 1.8.17 from 1.8.15 --- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 6511cb150..4c402db48 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -242,9 +242,9 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "DOXYGEN") set(PROGNAME doxygen) set(PATHS ${DOWNLOADS}/tools/doxygen) - set(URL "http://doxygen.nl/files/doxygen-1.8.15.windows.bin.zip") - set(ARCHIVE "doxygen-1.8.15.windows.bin.zip") - set(HASH 89482dcb1863d381d47812c985593e736d703931d49994e09c7c03ef67e064115d0222b8de1563a7930404c9bc2d3be323f3d13a01ef18861be584db3d5a953c) + set(URL "http://doxygen.nl/files/doxygen-1.8.17.windows.bin.zip") + set(ARCHIVE "doxygen-1.8.17.windows.bin.zip") + set(HASH 6bac47ec552486783a70cc73b44cf86b4ceda12aba6b52835c2221712bd0a6c845cecec178c9ddaa88237f5a781f797add528f47e4ed017c7888eb1dd2bc0b4b) elseif(VAR MATCHES "BAZEL") set(PROGNAME bazel) set(BAZEL_VERSION 0.25.2) -- cgit v1.2.3 From c50852aba0aa8df22e17133352edb432a9fc1e56 Mon Sep 17 00:00:00 2001 From: yurybura Date: Fri, 17 Jan 2020 02:10:15 +0300 Subject: [boost] Update to 1.72.0 (#9317) * [boost-python] Support Python2 as feature, fix build with installed Python2 * [boost-python] Update generate script to support Python2 mod * Re-generate boost ports * [boost-modular-build-helper] Update to 1.71. [boost-build] Update to 1.71. * [boost-modular-build-helper] Remove manual library name changing [boost-iostreams] Use boost-modular-headers.cmake script * Delete temporary file. * Revert changes in modular build script. * Update ports versions. * [boost-modular-build-helper] Fix build boost-iostreams with LZMA and ZSTD * [boost] Update to 1.72.0 * [libtorrent] Fix build with Boost 1.72.0 Original PR: https://github.com/arvidn/libtorrent/pull/4091 * Update ci.baseline.txt: - fail libgo:* due to use the removed class from Boost.Context 1.72.0 (reported issue https://github.com/yyzybb537/libgo/issues/214) - pass boost-context:arm64-windows - fix typo * Folly only supports the x64 architecture * fail boost-coroutine:arm64-windows=fail and boost-fiber:arm64-windows=fail because they use fcontext_t from Boost.Context which is not implemented for Windows on ARM64 (reported issue https://github.com/boostorg/context/issues/130) * Fix globbing-expressions * Add vcpkg_buildpath_length_warning(37) for boost-system. Revert boost-iostreams port changes. * Update ci.baseline.txt --- scripts/boost/generate-ports.ps1 | 72 +++++++++++++------------ scripts/boost/post-source-stubs/iostreams.cmake | 2 +- scripts/boost/post-source-stubs/python.cmake | 2 +- scripts/ci.baseline.txt | 10 +++- 4 files changed, 48 insertions(+), 38 deletions(-) (limited to 'scripts') diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 5f5897718..200b8376e 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.71.0" + $version = "1.72.0" ) $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition @@ -37,6 +37,7 @@ function Generate() { param ( [string]$Name, + [string]$PortName, [string]$Hash, [bool]$NeedsBuild, $Depends = @() @@ -44,29 +45,18 @@ function Generate() $controlDeps = ($Depends | sort) -join ", " - $sanitizedName = $name -replace "_","-" + $versionSuffix = "" - $versionsuffix = "" - if ($Name -eq "asio" -or $Name -eq "mpi") - { - $versionsuffix = "-1" - } - - if ($Name -eq "python" -or $Name -eq "test") - { - $versionsuffix = "-2" - } - - mkdir "$portsDir/boost-$sanitizedName" -erroraction SilentlyContinue | out-null + mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null $controlLines = @( "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" - "Source: boost-$sanitizedName" - "Version: $version$versionsuffix" + "Source: boost-$PortName" + "Version: $version$versionSuffix" "Build-Depends: $controlDeps" - "Homepage: https://github.com/boostorg/$name" + "Homepage: https://github.com/boostorg/$Name" "Description: Boost $Name module" ) - if ($Name -eq "locale") + if ($PortName -eq "locale") { $controlLines += @( "" @@ -75,7 +65,7 @@ function Generate() "Build-Depends: icu" ) } - if ($Name -eq "regex") + if ($PortName -eq "regex") { $controlLines += @( "" @@ -84,13 +74,24 @@ function Generate() "Build-Depends: icu" ) } - $controlLines | out-file -enc ascii "$portsDir/boost-$sanitizedName/CONTROL" + $controlLines | out-file -enc ascii "$portsDir/boost-$PortName/CONTROL" $portfileLines = @( "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" "" "include(vcpkg_common_functions)" "" + ) + + if ($PortName -eq "system") + { + $portfileLines += @( + "vcpkg_buildpath_length_warning(37)" + "" + ) + } + + $portfileLines += @( "vcpkg_from_github(" " OUT_SOURCE_PATH SOURCE_PATH" " REPO boostorg/$Name" @@ -98,11 +99,11 @@ function Generate() " SHA512 $Hash" " HEAD_REF master" ) - if ($Name -eq "asio") + if ($PortName -eq "asio") { $portfileLines += @(" PATCHES windows_alloca_header.patch") } - if ($Name -eq "iostreams") + if ($PortName -eq "iostreams") { $portfileLines += @(" PATCHES Removeseekpos.patch") } @@ -111,14 +112,14 @@ function Generate() "" ) - if (Test-Path "$scriptsDir/post-source-stubs/$Name.cmake") + if (Test-Path "$scriptsDir/post-source-stubs/$PortName.cmake") { - $portfileLines += @(get-content "$scriptsDir/post-source-stubs/$Name.cmake") + $portfileLines += @(get-content "$scriptsDir/post-source-stubs/$PortName.cmake") } if ($NeedsBuild) { - if ($Name -eq "locale") + if ($PortName -eq "locale") { $portfileLines += @( "if(`"icu`" IN_LIST FEATURES)" @@ -139,7 +140,7 @@ function Generate() ")" ) } - elseif ($Name -eq "regex") + elseif ($PortName -eq "regex") { $portfileLines += @( "if(`"icu`" IN_LIST FEATURES)" @@ -152,7 +153,7 @@ function Generate() "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"`${REQUIREMENTS}`")" ) } - elseif ($Name -eq "thread") + elseif ($PortName -eq "thread") { $portfileLines += @( "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" @@ -164,7 +165,7 @@ function Generate() ")" ) } - elseif ($Name -eq "iostreams") + elseif ($PortName -eq "iostreams") { } else @@ -175,7 +176,7 @@ function Generate() ) } } - if ($Name -ne "iostreams") + if ($PortName -ne "iostreams") { $portfileLines += @( "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)" @@ -183,12 +184,12 @@ function Generate() ) } - if (Test-Path "$scriptsDir/post-build-stubs/$Name.cmake") + if (Test-Path "$scriptsDir/post-build-stubs/$PortName.cmake") { - $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$Name.cmake") + $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$PortName.cmake") } - $portfileLines | out-file -enc ascii "$portsDir/boost-$sanitizedName/portfile.cmake" + $portfileLines | out-file -enc ascii "$portsDir/boost-$PortName/portfile.cmake" } if (!(Test-Path "$scriptsDir/boost")) @@ -383,13 +384,16 @@ foreach ($library in $libraries) $deps += @("mpi") } + $portName = $library -replace "_","-" + Generate ` -Name $library ` + -PortName $portName ` -Hash $hash ` -Depends $deps ` -NeedsBuild $needsBuild - $libraries_in_boost_port += @(TransformReference $library) + $libraries_in_boost_port += @(TransformReference $portName) } finally { @@ -400,7 +404,7 @@ foreach ($library in $libraries) if ($libraries_in_boost_port.length -gt 1) { # Generate master boost control file which depends on each individual library # mpi is excluded due to it having a dependency on msmpi - $boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" } | ? { $_ -notmatch "boost-mpi" }) -join ", " + $boostDependsList = @($libraries_in_boost_port | % { "boost-$_" } | ? { $_ -notmatch "boost-mpi" }) -join ", " @( "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" diff --git a/scripts/boost/post-source-stubs/iostreams.cmake b/scripts/boost/post-source-stubs/iostreams.cmake index 55841bb3f..df1479fb8 100644 --- a/scripts/boost/post-source-stubs/iostreams.cmake +++ b/scripts/boost/post-source-stubs/iostreams.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(LICENSE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.70.0/LICENSE_1_0.txt" + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.72.0/LICENSE_1_0.txt" FILENAME "boost_LICENSE_1_0.txt" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake index 40b8e0a0b..5610c489d 100644 --- a/scripts/boost/post-source-stubs/python.cmake +++ b/scripts/boost/post-source-stubs/python.cmake @@ -1,5 +1,5 @@ # Find Python. Can't use find_package here, but we already know where everything is -file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python[0-9.]*") +file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python3.*") set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib") set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib") string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2067b2983..c4889fbc6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -143,12 +143,13 @@ blosc:x64-uwp=fail bond:arm-uwp=fail bond:x64-osx=fail bond:x64-uwp=fail -boost-context:arm64-windows=fail boost-context:arm-uwp=fail boost-context:x64-uwp=fail boost-coroutine:arm-uwp=fail +boost-coroutine:arm64-windows=fail boost-coroutine:x64-uwp=fail boost-fiber:arm-uwp=fail +boost-fiber:arm64-windows=fail boost-fiber:x64-osx=fail boost-fiber:x64-uwp=fail boost-fiber:x64-linux=ignore @@ -456,6 +457,7 @@ fmilib:x64-windows=ignore fmilib:x64-windows-static=ignore fmilib:x86-windows=ignore # Folly fails due to a compiler bug in MSVC 19.22.27905, fixed in newer releases +folly:arm64-windows=fail folly:x86-windows=fail folly:x64-windows=fail folly:x64-windows-static=fail @@ -741,7 +743,12 @@ libgd:x64-linux=ignore libgit2:arm64-windows=fail libgit2:arm-uwp=fail libgit2:x64-uwp=fail +libgo:arm64-windows=fail +libgo:x64-linux=fail libgo:x64-osx=fail +libgo:x64-windows=fail +libgo:x64-windows-static=fail +libgo:x86-windows=fail libhydrogen:arm64-windows=fail libics:arm-uwp=fail libics:x64-uwp=fail @@ -1418,7 +1425,6 @@ qt5-macextras:x64-windows-static=fail qt5-macextras:x86-windows=fail qt5-winextras:x64-linux=fail qt5-winextras:x64-osx=fail -quantlib:x64-osx=fail quickfast:x64-linux=ignore quickfix:x64-linux=ignore quickfix:x64-windows=ignore -- cgit v1.2.3 From bf3e071e53bf46cba8857859f853dcc8898db817 Mon Sep 17 00:00:00 2001 From: Fabio Pellacini Date: Fri, 17 Jan 2020 07:56:33 +0100 Subject: [embree3] added cleanup command for static build (#9555) * added cleanup command to embree3 port for static build * updated CONTROL file with version tag * check if file exists before cleanups * fix baseline Co-authored-by: nicole mazzuca --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c4889fbc6..ab88ed6f6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -402,7 +402,6 @@ ecsutil:x64-uwp=fail embree2:x64-linux=fail embree2:x64-osx=fail embree2:x64-windows-static=fail -embree3:x64-osx=fail enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail -- cgit v1.2.3 From 38b959022cec1b865489d97a697eda84b49cc4e5 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Sat, 18 Jan 2020 00:36:08 +0100 Subject: Add support for building with MinGW (#9137) * Add support for building with MinGW Tested with MSYS2 MinGW 8.3.0, gcc-mcf.lhmouse MinGW 9.2.1, and StephanTLavavej/mingw-distro! * Add MinGW toolchain From your MinGW configured shell you could just use vcpkg to configure packages. An x64-mingw triplet would look like: ``` set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) ``` * Add MinGW community tripplets x64 tested with https://github.com/StephanTLavavej/mingw-distro x86, arm64, arm tested with https://github.com/mstorsjo/llvm-mingw --- scripts/cmake/vcpkg_common_definitions.cmake | 19 ++++++++----- scripts/cmake/vcpkg_configure_cmake.cmake | 8 +++--- scripts/templates/portfile.in.cmake | 7 ++--- scripts/toolchains/mingw.cmake | 40 ++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 scripts/toolchains/mingw.cmake (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 14cf460af..3a1818bf5 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -37,9 +37,12 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") set(VCPKG_TARGET_IS_ANDROID 1) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_TARGET_IS_FREEBSD 1) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(VCPKG_TARGET_IS_WINDOWS 1) + set(VCPKG_TARGET_IS_MINGW 1) endif() -#Helper variable to identify the host path separator. +#Helper variable to identify the host path separator. if(CMAKE_HOST_WIN32) set(VCPKG_HOST_PATH_SEPARATOR ";") elseif(CMAKE_HOST_UNIX) @@ -71,11 +74,15 @@ if(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "") set(VCPKG_FIND_LIBRARY_SUFFIXES ".lib" ".dll") #This is a slight modification to CMakes value which does not include ".dll". set(VCPKG_FIND_LIBRARY_PREFIXES "" "lib") #This is a slight modification to CMakes value which does not include "lib". - ## For CYGWIN and Windows GNU, maybe VCPKG will support that in the future? - #set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".dll.a") - #set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "lib") - #set(VCPKG_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") - #set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") +elseif(VCPKG_TARGET_IS_MINGW) + set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".dll.a") + set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll") + set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "lib") + set(VCPKG_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") + set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") elseif(VCPKG_TARGET_IS_OSX) set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX "") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index c31955fb2..260f2471e 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -59,7 +59,7 @@ ## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) function(vcpkg_configure_cmake) - cmake_parse_arguments(_csc + cmake_parse_arguments(_csc "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG" "SOURCE_PATH;GENERATOR" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" @@ -177,13 +177,13 @@ function(vcpkg_configure_cmake) "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " "It must be \"static\" or \"dynamic\"") endif() - + macro(check_both_vars_are_set var1 var2) if((NOT DEFINED ${var1} OR NOT DEFINED ${var2}) AND (DEFINED ${var1} OR DEFINED ${var2})) message(FATAL_ERROR "Both ${var1} and ${var2} must be set.") endif() endmacro() - + check_both_vars_are_set(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) check_both_vars_are_set(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) check_both_vars_are_set(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) @@ -204,6 +204,8 @@ function(vcpkg_configure_cmake) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") endif() endif() diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 62c53a6db..7ddf662e8 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -22,11 +22,12 @@ # VCPKG_TARGET_IS_OSX # VCPKG_TARGET_IS_FREEBSD # VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW # VCPKG_TARGET_EXECUTABLE_SUFFIX # VCPKG_TARGET_STATIC_LIBRARY_SUFFIX # VCPKG_TARGET_SHARED_LIBRARY_SUFFIX # -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md # # Specifies if the port install should fail immediately given a condition # vcpkg_fail_port_install(MESSAGE "@PORT@ currently only supports Linux and Mac platforms" ON_TARGET "Windows") @@ -39,10 +40,10 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE ${ARCHIVE} # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). # REF 1.0.0 - # (Optional) Read the docs for how to generate patches at: + # (Optional) Read the docs for how to generate patches at: # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md # PATCHES # 001_port_fixes.patch diff --git a/scripts/toolchains/mingw.cmake b/scripts/toolchains/mingw.cmake new file mode 100644 index 000000000..def98799f --- /dev/null +++ b/scripts/toolchains/mingw.cmake @@ -0,0 +1,40 @@ +if(NOT _VCPKG_MINGW_TOOLCHAIN) +set(_VCPKG_MINGW_TOOLCHAIN 1) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") +endif() + +# Need to override MinGW from VCPKG_CMAKE_SYSTEM_NAME +set(CMAKE_SYSTEM_NAME Windows CACHE STRING "" FORCE) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR i686 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR armv7 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "") +endif() + +foreach(lang C CXX) + set(CMAKE_${lang}_COMPILER_TARGET "${CMAKE_SYSTEM_PROCESSOR}-windows-gnu" CACHE STRING "") +endforeach() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + if(VCPKG_CRT_LINKAGE STREQUAL "static") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ") + endif() +endif() +endif() -- cgit v1.2.3 From 08c8214d68edda04cd9da8eda1b2271da00c8628 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Sat, 18 Jan 2020 08:12:40 +0800 Subject: [teemo] new port. (#9684) --- scripts/ci.baseline.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ab88ed6f6..255607e56 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1631,6 +1631,10 @@ tcl:arm64-windows=ignore tcl:x64-uwp=ignore tcl:x64-linux=ignore tcl:x64-osx=ignore +teemo:x64-uwp=fail +teemo:arm-uwp=fail +teemo:arm64-windows=fail +teemo:x64-osx=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail tensorflow-cc:arm64-windows=fail -- cgit v1.2.3 From 299e8b4ac6008c057edb503eb218f0217e9c8f99 Mon Sep 17 00:00:00 2001 From: SeekingMeaning Date: Fri, 17 Jan 2020 16:51:00 -0800 Subject: [scintilla] Update to 4.2.3 (#9591) * [scintilla] Update to 4.2.3 * Update ci.baseline.txt * Update --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 255607e56..d6c4ec8ce 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1497,7 +1497,6 @@ rpclib:x86-windows=ignore rpclib:x64-windows-static=ignore rttr:arm-uwp=fail rttr:x64-uwp=fail -scintilla:arm64-windows=fail scintilla:arm-uwp=fail scintilla:x64-linux=fail scintilla:x64-osx=fail -- cgit v1.2.3 From 127d49768113f099e9790184b314a2182dd8176d Mon Sep 17 00:00:00 2001 From: yurybura Date: Tue, 21 Jan 2020 23:25:05 +0300 Subject: [open62541] Update to v1.0 (#9767) * [open62541] Update to v1.0 * Remove dependency on python-six * Fix CI * Manually specify the version * Fix install binaries directory * Fix end line * Add homepage and modernize cmake --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d6c4ec8ce..6178084fe 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1196,7 +1196,6 @@ ompl:x64-osx=fail ompl:x64-linux=ignore open62541:arm-uwp=fail open62541:x64-uwp=fail -open62541:x64-osx=fail openal-soft:arm-uwp=fail openal-soft:x64-uwp=fail openblas:arm64-windows=fail -- cgit v1.2.3 From 70ee8b83e52ffd4530c27696cd99f4fb874ccb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 22 Jan 2020 04:29:39 +0800 Subject: [monkeys-audio] Update to 5.14, add feature tools (#9760) * [monkeys-audio] Update to 5.14, add feature tools * [monkeys-audio] Use macro MA_VERSION --- scripts/ci.baseline.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6178084fe..7689ca1d5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1065,8 +1065,7 @@ monkeys-audio:arm-uwp=fail monkeys-audio:x64-linux=fail monkeys-audio:x64-osx=fail monkeys-audio:x64-uwp=fail -monkeys-audio:x64-windows=fail -monkeys-audio:x86-windows=fail +monkeys-audio:x64-windows-static=fail moos-core:arm-uwp=fail moos-core:x64-uwp=fail moos-core:x64-windows=ignore -- cgit v1.2.3 From 45cab637618481dc43c92ad182925b4cf0244278 Mon Sep 17 00:00:00 2001 From: Julian Smolka Date: Wed, 22 Jan 2020 21:16:10 +0100 Subject: [asmjit] update to current version (#9770) * [asmjit] update to current version * [asmjit] remove x64-uwp from ci.baseline.text --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7689ca1d5..547ee1a87 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -90,7 +90,6 @@ arrow:x64-linux=fail arrow:x86-windows=fail asmjit:arm64-windows=fail asmjit:arm-uwp=fail -asmjit:x64-uwp=fail asyncplusplus:arm-uwp=fail asyncplusplus:x64-uwp=fail atk:x64-osx=fail -- cgit v1.2.3 From f992ddbed3baf216248b42cecc92de54c7c222f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Wed, 22 Jan 2020 21:27:45 +0100 Subject: [doxygen] Add alternative download URL (#9708) Only the current and the previous version of doxygen can be downloaded from: http://doxygen.nl Sourceforge provides the current version and any previously released versions for download: https://sourceforge.net/projects/doxygen/files/ Add sourceforge as alternative download URL. This avoids situations, when the version of doxygen in vcpkg is n-2 and cannot be downloaded any more, see e.g. commit: 526f9375800f846b113989fc3d566af7b8c79408 --- scripts/cmake/vcpkg_find_acquire_program.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 4c402db48..038e50b36 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -241,9 +241,12 @@ function(vcpkg_find_acquire_program VAR) set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) elseif(VAR MATCHES "DOXYGEN") set(PROGNAME doxygen) + set(DOXYGEN_VERSION 1.8.17) set(PATHS ${DOWNLOADS}/tools/doxygen) - set(URL "http://doxygen.nl/files/doxygen-1.8.17.windows.bin.zip") - set(ARCHIVE "doxygen-1.8.17.windows.bin.zip") + set(URL + "http://doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.windows.bin.zip" + "https://sourceforge.net/projects/doxygen/files/rel-${DOXYGEN_VERSION}/doxygen-${DOXYGEN_VERSION}.windows.bin.zip") + set(ARCHIVE "doxygen-${DOXYGEN_VERSION}.windows.bin.zip") set(HASH 6bac47ec552486783a70cc73b44cf86b4ceda12aba6b52835c2221712bd0a6c845cecec178c9ddaa88237f5a781f797add528f47e4ed017c7888eb1dd2bc0b4b) elseif(VAR MATCHES "BAZEL") set(PROGNAME bazel) -- cgit v1.2.3 From 7dc2a4ca9b1498004ab638202e5d991eacdf3dd3 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 22 Jan 2020 12:37:27 -0800 Subject: [string_theory] Update to 3.0, which is now header-only. (#9690) --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 547ee1a87..af974a83f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1610,9 +1610,6 @@ spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail stormlib:x64-uwp=fail -string-theory:arm-uwp=fail -string-theory:x64-uwp=fail -string-theory:x64-windows=ignore stxxl:arm-uwp=fail stxxl:x64-uwp=fail systemc:arm64-windows=fail -- cgit v1.2.3 From 2204efd414d1df30d861d19cf52f20e04d299c15 Mon Sep 17 00:00:00 2001 From: David Garcia <48836389+david-antiteum@users.noreply.github.com> Date: Wed, 22 Jan 2020 21:42:42 +0100 Subject: [jasper] freeglut is not a dependency in macOS (#9680) * [jasper] freeglut is not a dependency in macOS Also remove freeimage:x64-osx from baseline as now compiles * ogre fails in macOS --- scripts/ci.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index af974a83f..85e9d353b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -467,7 +467,6 @@ freeglut:arm64-windows=fail freeglut:arm-uwp=fail freeglut:x64-uwp=fail freeglut:x64-osx=fail -freeimage:x64-osx=fail freerdp:arm64-windows=fail freerdp:arm-uwp=fail freerdp:x64-osx=fail @@ -1178,6 +1177,7 @@ ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x86-windows = skip +ogre:x64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip ogre-next:arm-uwp = skip -- cgit v1.2.3 From 11b8872c973d02148e614a4b6ab0ec26ad239c7e Mon Sep 17 00:00:00 2001 From: Tatsuro Shibamura Date: Thu, 23 Jan 2020 05:44:54 +0900 Subject: [cryptopp] Fixed build error on ARM32/ARM64 Windows (#9633) * [cryptopp] Fixed build error on ARM64 Windows * [cryptopp] Update ci.baseline.txt * Update version * Use VCPKG_TARGET_IS_OSX variable --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 85e9d353b..098c50c68 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -294,8 +294,6 @@ cpuinfo:arm64-windows=ignore crfsuite:arm-uwp=fail crfsuite:x64-uwp=fail crossguid:x64-osx=fail -cryptopp:arm64-windows=fail -cryptopp:arm-uwp=fail cspice:arm-uwp=fail cspice:x64-uwp=fail ctemplate:arm64-windows=fail -- cgit v1.2.3 From 3aa59794717417d11366106ead0fcd943d63171f Mon Sep 17 00:00:00 2001 From: DCore Team <49679595+decent-dcore@users.noreply.github.com> Date: Wed, 22 Jan 2020 22:11:40 +0100 Subject: [pbc] Correct non Windows build (#9281) Co-authored-by: rfric <43748255+rfric@users.noreply.github.com> --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 098c50c68..e17703b3b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1300,6 +1300,8 @@ pangomm:x64-windows=ignore pangomm:x86-windows=ignore parmetis:x64-linux=fail parmetis:x64-osx=fail +pbc:arm-uwp=fail +pbc:x64-uwp=fail pcre2:arm-uwp=fail pdal:x64-linux=fail pdal:x64-osx=fail -- cgit v1.2.3 From 8c77506c4fc47c3ea4790d30fc78c45265b3e41a Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 23 Jan 2020 21:17:40 +0100 Subject: MinGW: Fix vcpkg common definitions (#9807) Since MinGW has both VCPKG_TARGET_IS_MINGW and VCPKG_TARGET_IS_WINDOWS, make sure to test the first before. --- scripts/cmake/vcpkg_common_definitions.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 3a1818bf5..724644abc 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -64,7 +64,16 @@ else() endif() #Helper variables for libraries -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_MINGW) + set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".dll.a") + set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll") + set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "lib") + set(VCPKG_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") + set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") +elseif(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".lib") set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".lib") set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll") @@ -74,15 +83,6 @@ if(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "") set(VCPKG_FIND_LIBRARY_SUFFIXES ".lib" ".dll") #This is a slight modification to CMakes value which does not include ".dll". set(VCPKG_FIND_LIBRARY_PREFIXES "" "lib") #This is a slight modification to CMakes value which does not include "lib". -elseif(VCPKG_TARGET_IS_MINGW) - set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") - set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".dll.a") - set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll") - set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib") - set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib") - set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "lib") - set(VCPKG_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") - set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") elseif(VCPKG_TARGET_IS_OSX) set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX "") -- cgit v1.2.3 From ed0df8ecc4ed7e755ea03e18aaf285fd9b4b4a74 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 24 Jan 2020 21:26:35 +0100 Subject: Make VS 2019 default to x64 (#9816) Since CMake also does this --- scripts/buildsystems/vcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e549f3fa1..5b596cba2 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -67,7 +67,7 @@ else() elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017$") set(_VCPKG_TARGET_TRIPLET_ARCH x86) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$") - set(_VCPKG_TARGET_TRIPLET_ARCH x86) + set(_VCPKG_TARGET_TRIPLET_ARCH x64) else() find_program(_VCPKG_CL cl) if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$") -- cgit v1.2.3 From 354733dbf8aa53571c7f7b451565742f42156339 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 28 Jan 2020 06:07:04 +0800 Subject: [memorymodule] Add new port (#9541) * [memorymodule] Add new port * [memorymodule] Update ci baseline * [memorymodule] Update CI baseline * [memorymodule] Simplify vcpkg_fail_port_install call * [memorymodule] Install lib files only if they exist --- scripts/ci.baseline.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e17703b3b..7cf80edf0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1016,6 +1016,10 @@ mecab:x64-uwp = skip mecab:x64-windows = skip mecab:x64-windows-static = skip mecab:x86-windows = skip +memorymodule:arm-uwp=fail +memorymodule:x64-linux=fail +memorymodule:x64-osx=fail +memorymodule:x64-uwp=fail meschach:arm-uwp=fail meschach:x64-linux=fail meschach:x64-osx=fail -- cgit v1.2.3 From 28b70b41c482c679cbcea8c9ea6d8d598cb3c648 Mon Sep 17 00:00:00 2001 From: sma-github <55330739+sma-github@users.noreply.github.com> Date: Mon, 27 Jan 2020 23:11:39 +0100 Subject: [ftgl] Fix build failure #9520 (#9521) * bugfix for [ftgl] build failure #9520. Applied same solution as cbezault did for #7697 * bugfix for [ftgl] build failure #9520. Added suggested changes from the review and clean-up EOL characters. * [ftgl] remove ftgl:x64-linux=fail from ci.baseline.txt * [ftgl] build failure #9520 - disable doxygen on Linux * [ftgl] build failure #9520 - force the compiler to use the C++11 standard * [ftgl] build failure #9520 - remove ftgl:x64-osx=fail * [ftgl] build failure #9520 - add missing C++11 standard patch --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7cf80edf0..7de42460f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -486,8 +486,6 @@ fribidi:arm-uwp=fail fribidi:x64-linux=fail fribidi:x64-osx=fail fribidi:x64-uwp=fail -ftgl:x64-linux=fail -ftgl:x64-osx=fail ftgl:x64-uwp=fail fuzzylite:arm-uwp=fail fuzzylite:x64-linux=fail -- cgit v1.2.3 From 6ab471d09e26a91aa1b5b3ed3565581c083ab183 Mon Sep 17 00:00:00 2001 From: Michael Mattsson Date: Mon, 27 Jan 2020 17:14:26 -0500 Subject: [asiosdk] Add new port (#9456) * [asiosdk] Add new port * specified vcpkg_fail_port_install for non-windows platforms * specified vcpkg_fail_port_install for arm & uwp platforms * added entries for asiosdk into scripts/ci.baseline.txt --- scripts/ci.baseline.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7de42460f..31152b319 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -88,6 +88,11 @@ argtable2:x64-uwp=fail arrow:arm64-windows=fail arrow:x64-linux=fail arrow:x86-windows=fail +asiosdk:x64-linux=fail +asiosdk:x64-osx=fail +asiosdk:x64-uwp=fail +asiosdk:arm64-windows=fail +asiosdk:arm-uwp=fail asmjit:arm64-windows=fail asmjit:arm-uwp=fail asyncplusplus:arm-uwp=fail -- cgit v1.2.3 From 268d7bb406bef5aea66a79c91d4ebc981c5a9860 Mon Sep 17 00:00:00 2001 From: Tatsuro Shibamura Date: Tue, 28 Jan 2020 07:32:23 +0900 Subject: [sdl2-gfx] Fixed build error ARM64 Windows 10 (#9314) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [sdl2-gfx] Fixed build error ARM64 Windows 10 * [sdl2-gfx] Update CI baseline * [sdl2-gfx] Fixed function name * Revert ci.baseline.txt * Remove sdl2-gfx:arm64-windows from ci.baseline.txt Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 31152b319..02da3bcd9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1526,7 +1526,6 @@ sdformat6:x64-linux=ignore sdl1:arm-uwp=fail sdl1:x64-uwp=fail sdl1:x64-osx=fail -sdl2-gfx:arm64-windows=fail sdl2-gfx:x64-linux=fail sdl2-gfx:x64-osx=fail sdl2-image:arm-uwp=fail -- cgit v1.2.3 From 23d7b88a39e2e02f4a3dbba2e6f4975ae4400b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20Barr=C3=A9-Brisebois?= Date: Mon, 27 Jan 2020 17:44:33 -0500 Subject: Update the repo for jom 1.1.3 (#9265) * Update the repo for jom 1.1.3 - The qt repo is unreliable, often down. Use the Berkeley mirror instead. * Set two possible URLs for JOM v1.1.3 * Update indent to match coding style --- scripts/cmake/vcpkg_find_acquire_program.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 038e50b36..6f23d05b6 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -127,7 +127,10 @@ function(vcpkg_find_acquire_program VAR) set(PROGNAME jom) set(SUBDIR "jom-1.1.3") set(PATHS ${DOWNLOADS}/tools/jom/${SUBDIR}) - set(URL "http://download.qt.io/official_releases/jom/jom_1_1_3.zip") + set(URL + "http://download.qt.io/official_releases/jom/jom_1_1_3.zip" + "http://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" + ) set(ARCHIVE "jom_1_1_3.zip") set(HASH 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) elseif(VAR MATCHES "7Z") -- cgit v1.2.3 From 89751b450a161c1451937ee5338e599a51cf53a2 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 27 Jan 2020 15:52:23 -0800 Subject: [vcpkg_find_acquire_program] Include version in downloaded python MSI name to avoid conflicts when updating (#8774) --- scripts/cmake/vcpkg_find_acquire_program.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 6f23d05b6..cb17ece21 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -110,7 +110,7 @@ function(vcpkg_find_acquire_program VAR) set(SUBDIR "python2") set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi") - set(ARCHIVE "python2.msi") + set(ARCHIVE "python-2.7.16.msi") set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254) else() set(PROGNAME python2) @@ -316,7 +316,7 @@ function(vcpkg_find_acquire_program VAR) file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif() else() - get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT) + get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} LAST_EXT) string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION) if(ARCHIVE_EXTENSION STREQUAL ".msi") file(TO_NATIVE_PATH "${ARCHIVE_PATH}" ARCHIVE_NATIVE_PATH) -- cgit v1.2.3 From 9986c559b8c90a760b2639b674b841908f34d594 Mon Sep 17 00:00:00 2001 From: Kotaro Inoue Date: Fri, 31 Jan 2020 05:55:19 +0900 Subject: [seal] Add new port (#9698) * Add Microsoft SEAL as a new port * Fix to choose either static or shared binaries * Fix to fail port install on Windows platforms * Fix to enable a command line build on windows * Fix to fail port install on UWP --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 02da3bcd9..e82bf9276 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1534,6 +1534,8 @@ sdl2-mixer:arm-uwp=fail sdl2-mixer:x64-uwp=fail sdl2-net:arm-uwp=fail sdl2-net:x64-uwp=fail +seal:arm-uwp=fail +seal:x64-uwp=fail secp256k1:x64-linux=fail secp256k1:x64-osx=fail selene:x64-linux=ignore -- cgit v1.2.3 From cf3e688dda65b2a6d4729edcaf83e99b32c92fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 31 Jan 2020 06:43:34 +0800 Subject: [aws-*]Update version (#8832) * [aws-c-common]Upgrade to 0.4.15 * [aws-c-common]Fix cmake target path. * [aws-c-event-stream]Upgrade to 0.1.4 * [aws-checksums]Upgrade to 0.1.5 [aws-c-event-stream]Fix cmake target path. [aws-lambda-cpp]Upgrade to 0.2.4 [aws-sdk-cpp]Upgrade to 1.7.214 * [aws=sdk-cpp]Set feature AWSMigrationHub to lowercase. * [aws-lambda-cpp] Drop support with OSX --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e82bf9276..e13f9870f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -117,6 +117,7 @@ aws-lambda-cpp:x64-uwp=fail aws-lambda-cpp:x64-windows=fail aws-lambda-cpp:x64-windows-static=fail aws-lambda-cpp:x86-windows=fail +aws-lambda-cpp:x64-osx=fail aws-sdk-cpp:x64-linux=ignore azure-c-shared-utility:arm-uwp=fail azure-c-shared-utility:x64-uwp=fail -- cgit v1.2.3 From e62d1361288e83eba786395b60361ab35ba83800 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Mon, 3 Feb 2020 14:22:52 -0800 Subject: [vcpkg] Add Supports: field. Use contents of triplets instead of names for dependency resolution. (#8601) * remove unfinished "supports" tag * extract "supports" from control files But do nothing with the value * Start `Supports` documentation * Use Supports in a bunch of control files I only tried matching the already existing logic in the portfile.cmake. * Cmake var provider (#8) * Cmake var provider (#9) * fix windows build (#10) * Add missing files to build * Fix test (#11) * adding hooks for cmake variables in expressions * Adding hooks for 'supports' in CI test * Fix test (#12) * Add overrides to evaluation environment * use "supported" tag in CI testing * cleanup comment * Fix issues with PR * [var_provider] Get library linkage variables from triplet * Fix compilation errors in tests * Add unimplemented functions * Fix unit tests part 1 * Fix issue when buildtrees dir does not exist * Change binary output hash * Fix handling of * feature * Add core feature when using * * Do not add Default-Features when installing 'core' * [vcpkg] WIP. 6 failing tests. * [vcpkg] WIP. 1 failing tests. * [vcpkg] WIP. 0 failing tests. * [vcpkg] Removed 'remove_graph'. 0 failing tests. * [vcpkg] Removed 'install_graph'. 0 failing tests. * [vcpkg] Remove AnyAction; replace with ActionPlan * [vcpkg] Minor cleanup. * [vcpkg][z3][qt5-connectivity][qt5-purchasing] Improve error messages while parsing. Fix a few trivial port issues. * [vcpkg] Work around ICE with MSVC v140 * [vcpkg] Add purge on fail to decompress for CI * [vcpkg] Fix parsing of nested parentheses in qualifiers * [vcpkg] Fix Linux builds (explicit qualification in declaration) * [vcpkg] Fix Build-Depends implying default features. Fix qualified dependencies regression. * [mmx] Add to skip list and full rebuild -- mmx causes problems by installing 'sched.h' * [libpqxx][mqtt-cpp] Prevent installing include/CMakeLists.txt * [cppitertools] Fix installed include namespace (should be include/cppitertools) * [libsoundio] Move headers into soundio/ subdirectory as per original cmake * [ci.baseline] Temporarily skip charls due to conflict with dcmtk * [vcpkg] Add restricted include files post build check -- bump global abi version * [libsoundio] Hotfix stray line in portfile * [vcpkg] Fix regression: CMake information was not being displayed for build-and-install actions * [jsonnet] Fix installation of internal headers; use system nlohmann-json * [grpc][upb] Teach grpc to use packaged upb. Add find_package(upb). Remove inappropriate upb features. * [zfp] Move problematic 'include/bitstream.h' to 'include/zfp/bitstream.h' * [x265] Bump control version to trigger rebuild after zfp conflict * [akali] Disable parallel configure * [dirent][dlfcn-win32][getopt-win32][pthreads] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [ci.baseline] Update baseline for improved upb support * [tgui] Disable parallel configure * [libiconv] Enable VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Disable parallel configure * [vcpkg] Implement policy VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Fix amount of escaping semicolons -- Note: I do not know the root cause requiring this change * [libodb-sqlite] Fix configuring into source directory * [gettext] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [libodb] DISABLE_PARALLEL_CONFIGURE * [vcpkg] Add 'config.h' and 'local.h' to restricted header list * [mcpp] Remove unused and problematic include 'config.h' from installed files * [teemo] Move installed headers into subdirectory to prevent conflicts with x265 * [ci.baseline] Update current OSX. Skip libmesh on all platforms due to heavy conflicts. * [vcpkg] Add 'slice.h' as a restricted header * [osg] Improve accuracy of dependencies (disable some, add some to Depends) * [vcpkg] Skip invoking a subprocess for 0 specs in load_tag_vars * [ci.baseline] Skip mongo-c-driver on osx due to flakiness * [teemo] Fix incorrect include file read * [osg] Fix dependency typo: glut -> freeglut * [vcpkg] Recover some lost performance with the addition of vcpkg_get_tags. A huge performance cost was loading the triplet files over and over; instead, we splice the sources into a macro and load it once, then just call that macro for each port. Remove use of hashing because we aren't cross-process-safe anyway (global static will do instead). * [vcpkg] Change Supports atom 'windows' to include UWP. Improve Supports field documentation. * [vcpkg] Add docs for VCPKG_ENV_PASSTHROUGH and VCPKG_DEP_INFO_OVERRIDE_VARS * Fix typo Co-authored-by: Curtis J Bezault Co-authored-by: Victor Romero Co-authored-by: Robert Schumacher --- scripts/ci.baseline.txt | 38 ++++++++++++++++----------- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 2 -- scripts/get_triplet_environment.cmake | 16 ----------- scripts/ports.cmake | 13 +++++---- scripts/vcpkg_get_dep_info.cmake | 19 ++++++++++++++ scripts/vcpkg_get_tags.cmake | 28 ++++++++++++++++++++ 6 files changed, 76 insertions(+), 40 deletions(-) delete mode 100644 scripts/get_triplet_environment.cmake create mode 100644 scripts/vcpkg_get_dep_info.cmake create mode 100644 scripts/vcpkg_get_tags.cmake (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e13f9870f..b658bcea3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -224,6 +224,9 @@ chakracore:x64-linux=fail chakracore:x64-osx=fail chakracore:x64-uwp=fail chakracore:x64-windows-static=fail +# DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) +charls:x64-linux=skip +charls:x64-osx=skip chartdir:arm64-windows=fail chartdir:arm-uwp=fail chartdir:x64-uwp=fail @@ -654,7 +657,6 @@ jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail -jsonnet:x64-osx=fail kd-soap:x64-linux=fail kd-soap:x64-osx=fail kd-soap:x64-windows-static=fail @@ -785,12 +787,15 @@ libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x86-windows = skip -libmesh:arm64-windows=fail -libmesh:arm-uwp=fail -libmesh:x64-uwp=fail -libmesh:x64-windows=fail -libmesh:x64-windows-static=fail -libmesh:x86-windows=fail +# libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) +libmesh:arm64-windows=skip +libmesh:arm-uwp=skip +libmesh:x64-uwp=skip +libmesh:x64-windows=skip +libmesh:x64-windows-static=skip +libmesh:x86-windows=skip +libmesh:x64-osx=skip +libmesh:x64-linux=skip libmicrohttpd:arm64-windows=fail libmicrohttpd:arm-uwp=fail libmicrohttpd:x64-linux=fail @@ -1057,11 +1062,18 @@ minizip:x64-uwp=fail mlpack:x64-linux=ignore mman:x64-linux=fail mman:x64-osx=fail -mmx:x64-windows=ignore -mmx:x64-windows-static=ignore -mmx:x86-windows=ignore +# mmx installs many problematic headers, such as `json.h` and `sched.h` +mmx:x64-windows=skip +mmx:x64-windows-static=skip +mmx:x86-windows=skip +mmx:x64-linux=skip +mmx:x64-osx=skip +mmx:arm-uwp=skip +mmx:x64-uwp=skip +mmx:arm64-windows=skip mongo-c-driver:arm64-windows=fail -mongo-c-driver:x64-osx=fail +# Flaky strange linker error +mongo-c-driver:x64-osx=skip mongoose:arm-uwp=fail mongoose:x64-uwp=fail monkeys-audio:arm64-windows=fail @@ -1722,12 +1734,8 @@ unrar:x64-linux=fail unrar:x64-osx=fail unrar:x64-uwp=fail unrar:x64-windows-static=fail -upb:arm64-windows=fail upb:arm-uwp=fail upb:x64-uwp=fail -upb:x64-windows=fail -upb:x64-windows-static=fail -upb:x86-windows=fail urdfdom:x64-windows-static=fail usd:x64-linux=ignore usd:x86-windows=fail diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index a042d9124..d72381be5 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -30,7 +30,6 @@ function(vcpkg_fixup_cmake_targets) set(_vfct_TARGET_PATH share/${PORT}) endif() - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(EXECUTABLE_SUFFIX "\\.exe") else() @@ -49,7 +48,6 @@ function(vcpkg_fixup_cmake_targets) set(DEBUG_CONFIG ${CURRENT_PACKAGES_DIR}/debug/${_vfct_CONFIG_PATH}) set(RELEASE_CONFIG ${CURRENT_PACKAGES_DIR}/${_vfct_CONFIG_PATH}) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(NOT EXISTS ${DEBUG_CONFIG}) message(FATAL_ERROR "'${DEBUG_CONFIG}' does not exist.") diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake deleted file mode 100644 index 3b0b9fbef..000000000 --- a/scripts/get_triplet_environment.cmake +++ /dev/null @@ -1,16 +0,0 @@ -include(${CMAKE_TRIPLET_FILE}) -if (DEFINED VCPKG_ENV_OVERRIDES_FILE) - include(${VCPKG_ENV_OVERRIDES_FILE}) -endif() - -# GUID used as a flag - "cut here line" -message("c35112b6-d1ba-415b-aa5d-81de856ef8eb") -message("VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}") -message("VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") -message("VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") -message("VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}") -message("VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}") -message("VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") -message("VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}") -message("VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH}") -message("VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE}") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 1aea1ffa3..20e59a184 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -78,13 +78,9 @@ if(CMD MATCHES "^BUILD$") include(${CMAKE_TRIPLET_FILE}) - if (DEFINED VCPKG_ENV_OVERRIDES_FILE) - include(${VCPKG_ENV_OVERRIDES_FILE}) - endif() - - if (DEFINED VCPKG_PORT_TOOLCHAINS) - foreach(VCPKG_PORT_TOOLCHAIN ${VCPKG_PORT_TOOLCHAINS}) - include(${VCPKG_PORT_TOOLCHAIN}) + if (DEFINED VCPKG_PORT_CONFIGS) + foreach(VCPKG_PORT_CONFIG ${VCPKG_PORT_CONFIGS}) + include(${VCPKG_PORT_CONFIG}) endforeach() endif() @@ -115,6 +111,9 @@ if(CMD MATCHES "^BUILD$") if (DEFINED VCPKG_POLICY_EMPTY_INCLUDE_FOLDER) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyEmptyIncludeFolder: ${VCPKG_POLICY_EMPTY_INCLUDE_FOLDER}\n") endif() + if (DEFINED VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS) + file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyAllowRestrictedHeaders: ${VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS}\n") + endif() if (DEFINED VCPKG_HEAD_VERSION) file(APPEND ${BUILD_INFO_FILE_PATH} "Version: ${VCPKG_HEAD_VERSION}\n") endif() diff --git a/scripts/vcpkg_get_dep_info.cmake b/scripts/vcpkg_get_dep_info.cmake new file mode 100644 index 000000000..92212b82d --- /dev/null +++ b/scripts/vcpkg_get_dep_info.cmake @@ -0,0 +1,19 @@ +function(vcpkg_get_dep_info PORT VCPKG_TRIPLET_ID) + message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") + vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) + + # GUID used as a flag - "cut here line" + message("c35112b6-d1ba-415b-aa5d-81de856ef8eb +VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} +VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} +VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} +VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} +VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} +VCPKG_DEP_INFO_OVERRIDE_VARS=${VCPKG_DEP_INFO_OVERRIDE_VARS} +CMAKE_HOST_SYSTEM_NAME=${CMAKE_HOST_SYSTEM_NAME} +CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR} +CMAKE_HOST_SYSTEM_VERSION=${CMAKE_HOST_SYSTEM_VERSION} +CMAKE_HOST_SYSTEM=${CMAKE_HOST_SYSTEM} +e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f +8c504940-be29-4cba-9f8f-6cd83e9d87b7") +endfunction() diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake new file mode 100644 index 000000000..ccdc4fea6 --- /dev/null +++ b/scripts/vcpkg_get_tags.cmake @@ -0,0 +1,28 @@ +function(vcpkg_get_tags PORT FEATURES VCPKG_TRIPLET_ID VCPKG_ABI_SETTINGS_FILE) + message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") + vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) + + # GUID used as a flag - "cut here line" + message("c35112b6-d1ba-415b-aa5d-81de856ef8eb +VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} +VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} +VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} +VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET} +VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH} +VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} +VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE} +e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") + + # Just to enforce the user didn't set it in the triplet file + if (DEFINED VCPKG_PUBLIC_ABI_OVERRIDE) + set(VCPKG_PUBLIC_ABI_OVERRIDE) + message(WARNING "VCPKG_PUBLIC_ABI_OVERRIDE set in the triplet will be ignored.") + endif() + include("${VCPKG_ABI_SETTINGS_FILE}" OPTIONAL) + + message("c35112b6-d1ba-415b-aa5d-81de856ef8eb +VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE} +VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH} +e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f +8c504940-be29-4cba-9f8f-6cd83e9d87b7") +endfunction() -- cgit v1.2.3 From fa022fb0fb85c627c8b55c574668b36cade71ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 5 Feb 2020 03:32:03 +0800 Subject: [tools] Add python64 bit. (#7964) * [tools]Add python64 bit. * [pybind11/shiva]Add version number. * [duktape]Fix build error using python64 bit. * [duktape]Fix python2 path. * [duktape]Fix duketape build: using python2 tools. * Change subdirs and archive names for PYTHON2 and PYTHON3 * [duktape] Update version info * [shiva] Add homepage * update baseline * update baseline Co-authored-by: Victor Romero --- scripts/ci.baseline.txt | 2 +- scripts/cmake/vcpkg_find_acquire_program.cmake | 30 +++++++++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b658bcea3..99f9bceb0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1564,11 +1564,11 @@ sfgui:x64-linux=ignore sfml:arm64-windows=fail shapelib:arm-uwp=fail shapelib:x64-uwp=fail -shiva:x64-windows=fail shiva:x64-windows-static=fail shiva-sfml:x64-linux=fail shiva-sfml:x64-osx=fail shiva-sfml:x86-windows=fail +shiva-sfml:x64-windows=fail shogun:arm64-windows = skip shogun:arm-uwp = skip shogun:x64-osx=fail diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index cb17ece21..a525dbc11 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -93,11 +93,18 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(SUBDIR "python-3.7.3") + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(SUBDIR "python-3.7.3-x86") + set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip") + set(ARCHIVE "python-3.7.3-embed-win32.zip") + set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31) + else() + set(SUBDIR "python-3.7.3-x64") + set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-amd64.zip") + set(ARCHIVE "python-3.7.3-embed-amd64.zip") + set(HASH 4b3e0067b5e8d00b1cac5d556ab4fbd71df2a1852afb3354ee62363aabc8801aca84da09dbd26125527ae54b50488f808c1d82abf18969c23a51dcd57576885f) + endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip") - set(ARCHIVE "python-3.7.3-embed-win32.zip") - set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31) set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E remove python37._pth) else() set(PROGNAME python3) @@ -107,11 +114,18 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON2") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(SUBDIR "python2") + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(SUBDIR "python-2.7.16-x86") + set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi") + set(ARCHIVE "python-2.7.16.msi") + set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254) + else() + set(SUBDIR "python-2.7.16-x64") + set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.amd64.msi") + set(ARCHIVE "python-2.7.16.amd64.msi") + set(HASH 47c1518d1da939e3ba6722c54747778b93a44c525bcb358b253c23b2510374a49a43739c8d0454cedade858f54efa6319763ba33316fdc721305bc457efe4ffb) + endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi") - set(ARCHIVE "python-2.7.16.msi") - set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254) else() set(PROGNAME python2) set(BREW_PACKAGE_NAME "python2") -- cgit v1.2.3 From ed863b163c1909bdc33587174f6bb8e9cb170310 Mon Sep 17 00:00:00 2001 From: Oliver John Hitchcock Date: Tue, 4 Feb 2020 22:10:03 +0000 Subject: [EAThread][EASTL] Added EAThread and modified EASTL (#8861) * [EAThread][EASTL] Added EAThread and modified EASTL EABase has now also been seperated from EASTL. EASTL now copies CommonCppFlags.cmake as it is used by EAThread. * Fix EABase * Fix EABASE include for EASTL * Improve EASTL Still need to fix The /debug/lib/cmake folder should be merged with /lib/cmake into /share/eastl Found 3 error(s). Please correct the portfile: E:\vcpkg\ports\eastl\portfile.cmake -- Performing post-build validation done Error: Building package eastl:x64-windows-static failed with: POST_BUILD_CHECKS_FAILED Please ensure you're using the latest portfiles with `.\vcpkg update`, then submit an issue at https://github.com/Microsoft/vcpkg/issues including: Package: eastl:x64-windows-static Vcpkg version: 2019.09.12-nohash * Base pass one Thread * Fix config errors and add `vcpkg_fixup_cmake_targets` * Add required changes for fails * x86-windows should also fail * Revert adding `vcpkg_fail_port_install(ON_TARGET "Windows" ...)` * Remove `eastl:arm64-windows=fail` from ci.baseline.txt * Merge CONTROL descriptions into one line --- scripts/ci.baseline.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 99f9bceb0..640808d70 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -380,7 +380,6 @@ dxut:arm-uwp=fail dxut:x64-linux=fail dxut:x64-osx=fail dxut:x64-windows-static=fail -eastl:arm64-windows=fail eastl:arm-uwp=fail easyhook:arm64-windows=fail easyhook:arm-uwp=fail @@ -390,6 +389,10 @@ easyhook:x64-uwp=fail easyhook:x64-windows-static=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail +eathread:arm64-windows=fail +eathread:arm-uwp=fail +eathread:x64-uwp=fail +eathread:x86-windows=fail ebml:arm-uwp=fail ebml:x64-uwp=fail ecm:arm64-windows = skip -- cgit v1.2.3 From d09f4faf526b33a8d938e653589ec1d726ef146f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 5 Feb 2020 06:46:24 +0800 Subject: [cppmicroservices] Fix find dependency gtest (#9886) * [cppmicroservices] Fix find dependency gtest * update baseline --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 640808d70..e23b38481 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -282,8 +282,6 @@ cppfs:x64-uwp=fail cppgraphqlgen:arm-uwp=fail cppgraphqlgen:x64-uwp=ignore cppkafka:x64-linux=ignore -cppmicroservices:x86-windows=fail -cppmicroservices:x64-windows=fail cppmicroservices:arm64-windows=fail cppmicroservices:arm-uwp=fail cppmicroservices:x64-uwp=fail -- cgit v1.2.3