From d562441fc96e160444cf476351b986bd410e5a2b Mon Sep 17 00:00:00 2001 From: Jayesh Badwaik Date: Tue, 27 Nov 2018 01:52:11 +0100 Subject: [xmsh] add support for xmsh library (#4656) * [xmsh] add support for xmsh library - xmsh is a mesh document format. xmsh library is the reference implementation for the format. * [xmsh] removed extraneous file command * [xmsh] update version to v0.2.3 * [xmsh] upgrade to version v0.3.1 * [xmsh] update to version v0.4 * + fix python executable packaging * [vcpkg_find_acquire_program] Fix PYTHON3 on non-Windows --- scripts/cmake/vcpkg_find_acquire_program.cmake | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 1ff2ab071..ebe46b335 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -77,12 +77,18 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) elseif(VAR MATCHES "PYTHON3") - set(PROGNAME python) - set(SUBDIR "python3") - set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") - set(ARCHIVE "python-3.5.4-embed-win32.zip") - set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + if(CMAKE_HOST_WIN32) + set(PROGNAME python) + set(SUBDIR "python3") + set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) + set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") + set(ARCHIVE "python-3.5.4-embed-win32.zip") + set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + else() + set(PROGNAME python3) + set(BREW_PACKAGE_NAME "python") + set(APT_PACKAGE_NAME "python3") + endif() elseif(VAR MATCHES "PYTHON2") set(PROGNAME python) set(SUBDIR "python2") -- cgit v1.2.3 From 4d1fd42fca46f4c4dfe35011c8c96ff941db3ca6 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 14 Nov 2018 15:11:41 -0800 Subject: [vcpkg-toolchains] Use XYZ_INIT CMake variables for _significantly_ better integration [brynet] Add missing openssl dependency [discord-rpc] Ensure no external downloading [podofo] Improve stability. Modernize. [usrsctp] Disable Werror [vcpkg-toolchains] Add linux changes to android and freebsd. [usrsctp] Remove excess DLLs --- scripts/toolchains/android.cmake | 16 ++++++++++++++++ scripts/toolchains/freebsd.cmake | 20 +++++++++++--------- scripts/toolchains/linux.cmake | 20 +++++++++++--------- scripts/toolchains/osx.cmake | 20 +++++++++++--------- 4 files changed, 49 insertions(+), 27 deletions(-) (limited to 'scripts') diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 355ccc3ac..893463056 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -17,3 +17,19 @@ if(NOT EXISTS "${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") endif() include("${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") + +if(NOT _VCPKG_ANDROID_TOOLCHAIN) +set(_VCPKG_ANDROID_TOOLCHAIN 1) +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${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} ") +endif() +endif() diff --git a/scripts/toolchains/freebsd.cmake b/scripts/toolchains/freebsd.cmake index ecd4a4478..b6bf5a479 100644 --- a/scripts/toolchains/freebsd.cmake +++ b/scripts/toolchains/freebsd.cmake @@ -1,3 +1,5 @@ +if(NOT _VCPKG_FREEBSD_TOOLCHAIN) +set(_VCPKG_FREEBSD_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") endif() @@ -5,14 +7,14 @@ set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${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} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") +endif() endif() diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index ade9db90b..6bfb57621 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -1,3 +1,5 @@ +if(NOT _VCPKG_LINUX_TOOLCHAIN) +set(_VCPKG_LINUX_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") endif() @@ -5,14 +7,14 @@ set(CMAKE_SYSTEM_NAME Linux CACHE STRING "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${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} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") +endif() endif() diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake index 9465ae0de..7f6487c40 100644 --- a/scripts/toolchains/osx.cmake +++ b/scripts/toolchains/osx.cmake @@ -1,3 +1,5 @@ +if(NOT _VCPKG_OSX_TOOLCHAIN) +set(_VCPKG_OSX_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") @@ -13,14 +15,14 @@ set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${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} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") +endif() endif() -- cgit v1.2.3 From 221b65afc56fdc97a84d8cffac9636c28f633e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mendakiewicz?= Date: Mon, 10 Dec 2018 20:21:32 -0800 Subject: Replace MinGit with PortableGit MinGit does not provide gzip.exe required by git archive required by vcpkg_from_git --- scripts/vcpkgTools.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 650e46b03..de01a9557 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -24,9 +24,9 @@ 2.19.1 cmd\git.exe - https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/MinGit-2.19.1-32-bit.zip - 8a6d2caae2cbaacee073a641cda21465a749325c0af620dabd0e5521c84c92c8d747caa468b111d2ec52b99aee2ee3e6ec41a0a07a8fff582f4c8da568ea329e - MinGit-2.19.1-32-bit.zip + https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/PortableGit-2.19.1-32-bit.7z.exe + 50e11ba1190bca0210cf1aac4a1a10acddc8cff2f15ac4d036c1fcbab816ee35089b6115554e7d346dfb6f37003dc5da4bea396f3db4dae9b2f2bdd23fd0d876 + PortableGit-2.19.1-32-bit.7z.exe 2.7.4 -- cgit v1.2.3 From 3fb47a376f94094a5b2ffd46bb016a5955eb8530 Mon Sep 17 00:00:00 2001 From: Andrew Sayman Date: Tue, 11 Dec 2018 02:30:37 -0500 Subject: Include instructions for CentOS bootstrapping (#4892) Currently only includes Ubuntu or apt oriented system. CentOS provides similarly working compilers through devtoolsets. --- scripts/bootstrap.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 478183372..cc272da58 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -181,9 +181,14 @@ selectCXX() gccversion="$(extractStringBetweenDelimiters "$gccversion" "gcc version " ".")" if [ "$gccversion" -lt "6" ]; then echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7." + echo "On Ubuntu try the following: echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" echo "sudo apt-get update -y" echo "sudo apt-get install g++-7 -y" + echo "On CentOS try the following:" + echo "sudo yum install centos-release-scl" + echo "sudo yum install devtoolset-7" + echo "scl enable devtoolset-7 bash" return 1 fi -- cgit v1.2.3 From 13d1231ad4d6df3c26c846b542bcc4185615c833 Mon Sep 17 00:00:00 2001 From: Berrysoft <37586447+Berrysoft@users.noreply.github.com> Date: Tue, 11 Dec 2018 16:31:44 +0800 Subject: Adapt bootstrap to VS 2019 Preview (#4922) --- scripts/bootstrap.ps1 | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'scripts') diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index ed82a6ab1..42eabd01b 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -160,6 +160,16 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) } $majorVersion = $version.Substring(0,2); + if ($majorVersion -eq "16") + { + $VCFolder= "$path\VC\Tools\MSVC\" + if (Test-Path $VCFolder) + { + Write-Verbose "Picking: $instanceCandidate" + return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141" + } + } + if ($majorVersion -eq "15") { $VCFolder= "$path\VC\Tools\MSVC\" -- cgit v1.2.3 From 42fd0c982a2e201674cea1979457079bb1bce046 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Tue, 11 Dec 2018 11:12:21 +0100 Subject: Fix unterminated quoted string in bootstrapping script. (#4946) --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index cc272da58..a8b3d102b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -181,7 +181,7 @@ selectCXX() gccversion="$(extractStringBetweenDelimiters "$gccversion" "gcc version " ".")" if [ "$gccversion" -lt "6" ]; then echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7." - echo "On Ubuntu try the following: + echo "On Ubuntu try the following:" echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" echo "sudo apt-get update -y" echo "sudo apt-get install g++-7 -y" -- cgit v1.2.3 From 905f04da3d8b5c7275eb2ee60044c2b41ed1d81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mendakiewicz?= Date: Tue, 11 Dec 2018 08:47:16 -0800 Subject: Upgrade to Git 2.20.0 --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index de01a9557..9378c7832 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -22,11 +22,11 @@ cmake-3.12.4-Linux-x86_64.tar.gz - 2.19.1 + 2.20.0 cmd\git.exe - https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/PortableGit-2.19.1-32-bit.7z.exe - 50e11ba1190bca0210cf1aac4a1a10acddc8cff2f15ac4d036c1fcbab816ee35089b6115554e7d346dfb6f37003dc5da4bea396f3db4dae9b2f2bdd23fd0d876 - PortableGit-2.19.1-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe + 81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49 + PortableGit-2.20.0-32-bit.7z.exe 2.7.4 -- cgit v1.2.3 From cf7e2f3906f78dcb89f320a642428b54c00e4e0b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 11 Dec 2018 11:48:41 -0800 Subject: Allow redirection of the downloads folder with an environment variable. (#4883) * Add detection for VCPKG_DOWNLOADS environment variable in vcpkgpaths.cpp. * Pass the downloads directory from VcpkgPaths to cmake. * Also fixup bootstrap on *nix. * Make error message a little prettier. * Make that bash script actually work :) * [vcpkg] Alter Optional<> usage style * [vcpkg-docs] Add section on Environment Variables to the docs --- scripts/bootstrap.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a8b3d102b..5de0998c1 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -17,7 +17,16 @@ while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do vcpkgRootDir="$(dirname "$vcpkgRootDir")" done -downloadsDir="$vcpkgRootDir/downloads" +if [ -z ${VCPKG_DOWNLOADS+x} ]; then + downloadsDir="$vcpkgRootDir/downloads" +else + downloadsDir="$VCPKG_DOWNLOADS" + if [ ! -d "$VCPKG_DOWNLOADS" ]; then + echo "VCPKG_DOWNLOADS was set to '$VCPKG_DOWNLOADS', but that was not a directory." + exit 1 + fi + +fi extractStringBetweenDelimiters() { -- cgit v1.2.3 From 828cedb755d1ef1616e4e134bf1c6ef1ee2ae389 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 11 Dec 2018 10:15:44 -0800 Subject: [vcpkg] Add support for muslc, static crt linkage, and forcing the system binaries for cmake and ninja --- scripts/bootstrap.sh | 37 +++++++++++++++++++++++++++---------- scripts/toolchains/linux.cmake | 4 ++++ 2 files changed, 31 insertions(+), 10 deletions(-) (limited to 'scripts') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 5de0998c1..4bb428668 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,12 +1,23 @@ #!/bin/sh vcpkgDisableMetrics="OFF" +vcpkgUseSystem=false for var in "$@" do - if [ "$var" = "-disableMetrics" ]; then + if [ "$var" = "-disableMetrics" -o "$var" = "--disableMetrics" ]; then vcpkgDisableMetrics="ON" + elif [ "$var" = "-useSystemBinaries" -o "$var" = "--useSystemBinaries" ]; then + vcpkgUseSystem=true + elif [ "$var" = "-help" -o "$var" = "--help" ]; then + echo "Usage: ./bootstrap-vcpkg.sh [options]" + echo + echo "Options:" + echo " -help Display usage help" + echo " -disableMetrics Do not build metrics reporting into the executable" + echo " -useSystemBinaries Force use of the system utilities for building vcpkg" + exit 1 else - echo "Unknown argument $var" + echo "Unknown argument $var. Use '-help' for help." exit 1 fi done @@ -191,13 +202,13 @@ selectCXX() if [ "$gccversion" -lt "6" ]; then echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7." echo "On Ubuntu try the following:" - echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" - echo "sudo apt-get update -y" - echo "sudo apt-get install g++-7 -y" + echo " sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" + echo " sudo apt-get update -y" + echo " sudo apt-get install g++-7 -y" echo "On CentOS try the following:" - echo "sudo yum install centos-release-scl" - echo "sudo yum install devtoolset-7" - echo "scl enable devtoolset-7 bash" + echo " sudo yum install centos-release-scl" + echo " sudo yum install devtoolset-7" + echo " scl enable devtoolset-7 bash" return 1 fi @@ -206,8 +217,14 @@ selectCXX() # Preparation UNAME="$(uname)" -fetchTool "cmake" "$UNAME" cmakeExe || exit 1 -fetchTool "ninja" "$UNAME" ninjaExe || exit 1 + +if $vcpkgUseSystem; then + cmakeExe="cmake" + ninjaExe="ninja" +else + fetchTool "cmake" "$UNAME" cmakeExe || exit 1 + fetchTool "ninja" "$UNAME" ninjaExe || exit 1 +fi selectCXX CXX || exit 1 # Do the build diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index 6bfb57621..b9cbc0ff3 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -16,5 +16,9 @@ if(NOT _CMAKE_IN_TRY_COMPILE) 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 fed9a245268df9591a4150fb1f916df0894ca9d3 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 13 Dec 2018 13:49:24 -0800 Subject: [autocomplete] Add tab-completion support for bash --- scripts/vcpkg_completion.bash | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 scripts/vcpkg_completion.bash (limited to 'scripts') diff --git a/scripts/vcpkg_completion.bash b/scripts/vcpkg_completion.bash new file mode 100644 index 000000000..804507d58 --- /dev/null +++ b/scripts/vcpkg_completion.bash @@ -0,0 +1,17 @@ +#/usr/bin/env bash + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) + + # Colon is treated as a delimiter in bash. The following workaround + # allows triplet completion to work correctly in the syntax: + # zlib:x64-windows + local cur + _get_comp_words_by_ref -n : cur + __ltrim_colon_completions "$cur" +} + +complete -F _vcpkg_completions vcpkg -- cgit v1.2.3 From 0d1229d34babdc9c8fbfe2e1b43b38e657519093 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 17 Dec 2018 09:34:45 +0100 Subject: update msys2 to latest release --- scripts/cmake/vcpkg_acquire_msys.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index ed4f7ac29..adbd58ca5 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -53,20 +53,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64") set(TOOLSUBPATH msys64) set(URLS - "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-x86_64-20161025.tar.xz") - set(HASH 6c4c18ec59db80b8269698d074866438a624f1ce735ee5005a01b148b02e8f2e966ae381aa1cb4c50f6226c3b7feb271e36907cf26580df084d695b3c9f5c0eb) + set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz") + set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056) set(STAMP "initialized-msys2_64.stamp") else() set(TOOLSUBPATH msys32) set(URLS - "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-i686-20161025.tar.xz") - set(HASH c9260a38e0c6bf963adeaea098c4e376449c1dd0afe07480741d6583a1ac4c138951ccb0c5388bd148e04255a5c1a23bf5ee2d58dcd6607c14f1eaa5639a7c85) + set(ARCHIVE "msys2-base-i686-20181211.tar.xz") + set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f) set(STAMP "initialized-msys2_32.stamp") endif() -- cgit v1.2.3 From ae2b0639a322824e1b69afad6ae855230d16c948 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Mon, 17 Dec 2018 16:26:56 -0800 Subject: [graphqlparser] Use default library type for the platform instead of specifying SHARED (#4794) * Use default library type for the platform instead of specifying SHARED * [graphqlparser] Bump control version and slight cleanup * [vcpkg_find_acquire_program] Correct for previous corruption of CI --- scripts/cmake/vcpkg_find_acquire_program.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index ebe46b335..b6cfc4aab 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -153,6 +153,9 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4" AND SUBDIR STREQUAL "win_flex-2.5.16") + file(REMOVE_RECURSE "${PATHS}") + endif() else() set(PROGNAME flex) set(APT_PACKAGE_NAME flex) -- cgit v1.2.3 From b2996e1fd48842446a64443d057c576f819bda00 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Mon, 17 Dec 2018 16:45:09 -0800 Subject: Support custom Android NDK, better ABI specification (#4986) --- scripts/toolchains/android.cmake | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 893463056..69192aeca 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,11 +1,22 @@ set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") set(CMAKE_SYSTEM_NAME Android CACHE STRING "") -set(ANDROID_ABI x86_64 CACHE STRING "") set(ANDROID_TOOLCHAIN clang CACHE STRING "") set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "") set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") +if (VCPKG_TARGET_TRIPLET STREQUAL "arm64-android") + set(ANDROID_ABI arm64-v8a CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET STREQUAL "arm-android") + set(ANDROID_ABI armeabi-v7a CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET STREQUAL "x64-android") + set(ANDROID_ABI x86_64 CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET STREQUAL "x86-android") + set(ANDROID_ABI x86 CACHE STRING "") +else() + message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}") +endif() + if(DEFINED ENV{ANDROID_NDK_HOME}) set(ANDROID_NDK_HOME $ENV{ANDROID_NDK_HOME}) else() -- cgit v1.2.3 From 2d63525a154cf6aba8db2014792eec62087fe1e6 Mon Sep 17 00:00:00 2001 From: ivysnow Date: Tue, 8 Jan 2019 08:03:35 +0800 Subject: [vcpkg] add support for FreeBSD (#4917) * [vcpkg] add support for FreeBSD * [x64-freebsd] Remove triplet because it is not currently in the set of supported triplets --- scripts/bootstrap.sh | 2 ++ scripts/cmake/vcpkg_configure_cmake.cmake | 2 ++ scripts/cmake/vcpkg_find_acquire_program.cmake | 2 ++ scripts/vcpkgTools.xml | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+) (limited to 'scripts') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4bb428668..7a1b2777b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -123,6 +123,8 @@ fetchTool() os="linux" elif [ "$UNAME" = "Darwin" ]; then os="osx" + elif [ "$UNAME" = "FreeBSD" ]; then + os="freebsd" else echo "Unknown uname: $UNAME" return 1 diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 617fe1a0f..cf3fc7861 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -170,6 +170,8 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake") endif() list(APPEND _csc_OPTIONS diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b6cfc4aab..0c3a9bca2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -123,6 +123,8 @@ function(vcpkg_find_acquire_program VAR) set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx") + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") else() set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux") endif() diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 9378c7832..18ca741c2 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -21,6 +21,13 @@ ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f cmake-3.12.4-Linux-x86_64.tar.gz + + 3.12.4 + cmake-3.12.4-FreeBSD-x86_64/bin/cmake + https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz + b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 + cmake-3.12.4-FreeBSD-x86_64.tar.gz + 2.20.0 cmd\git.exe @@ -40,6 +47,12 @@ + + 2.7.4 + + + + 2.4.1 vswhere.exe @@ -94,4 +107,11 @@ acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3 ninja-mac-1.8.2.zip + + 1.8.2 + ninja + https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip + 56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86 + ninja-freebsd-1.8.2.zip + -- cgit v1.2.3 From 13ec61a842588480f49d3c3a6a3b42d70df4fa84 Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Wed, 16 Jan 2019 23:54:59 +0100 Subject: [qt5] update to QT5.12 (#4991) * update qt5-base to 5.12 * update modules to 5.12 (qt5-declarative and dependents don't work yet) * fix qt5-declarative for 5.12 and some hashes. * add qt5-declarative as dependency for qt5-graphicaleffects --- scripts/cmake/vcpkg_build_qmake.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 189a1113b..947178686 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -51,7 +51,7 @@ function(vcpkg_build_qmake) file(READ "${DEBUG_MAKEFILE}" _contents) string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}") string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}") - string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}") + string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}") string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}") string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}") string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}") @@ -72,7 +72,7 @@ function(vcpkg_build_qmake) foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES}) file(READ "${RELEASE_MAKEFILE}" _contents) - string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}") + string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}") string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}") string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}") string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}") -- cgit v1.2.3 From 581fd4501bb9e107f33bf971d474f1a8c9fc10a5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 28 Jan 2019 15:37:23 -0800 Subject: [vcpkg_find_acquire_program] Improve robustness of finding bison --- 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 0c3a9bca2..87b6fb4fe 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -155,7 +155,7 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) - if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4" AND SUBDIR STREQUAL "win_flex-2.5.16") + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4") file(REMOVE_RECURSE "${PATHS}") endif() else() @@ -171,6 +171,9 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4") + file(REMOVE_RECURSE "${PATHS}") + endif() else() set(PROGNAME bison) set(APT_PACKAGE_NAME bison) -- cgit v1.2.3 From e6552f118071a9798a2ffada7ae4707f3b29ed14 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Tue, 29 Jan 2019 14:43:39 -0700 Subject: [BZip2] Fix Unix Dynamic Builds (#5184) * [BZip2] Fix Unix Dynamic Builds * [bzip2] Bump control version * [libgta] Only build one flavor * [vcpkg_configure_cmake] Resolve #2375 since we now use CMake >= 3.11 --- scripts/cmake/vcpkg_configure_cmake.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index cf3fc7861..f7b81de93 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -77,9 +77,6 @@ function(vcpkg_configure_cmake) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility set(NINJA_CAN_BE_USED OFF) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - # Arm64 usage should be allowed once github issue #2375 is resolved - set(NINJA_CAN_BE_USED OFF) endif() if(_csc_GENERATOR) -- cgit v1.2.3 From fd56ffcf5c9a7ace36c8d4e0dc9785605b0fbd45 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Jan 2019 14:56:05 -0800 Subject: [vcpkg] Enable bootstrapping with VS2019 --- scripts/bootstrap.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 42eabd01b..0a24afa05 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -166,7 +166,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) if (Test-Path $VCFolder) { Write-Verbose "Picking: $instanceCandidate" - return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141" + return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142" } } @@ -192,7 +192,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) } } - throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed." + throw "Could not find MSBuild version with C++ support. VS2015, VS2017, or VS2019 (with C++) needs to be installed." } function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = $False, [Parameter(Mandatory=$False)][switch]$DisableWin81SDK = $False, @@ -396,7 +396,7 @@ if ($ec -ne 0) } Write-Host "`nBuilding vcpkg.exe... done.`n" -Write-Verbose("Placing vcpkg.exe in the correct location") +Write-Verbose "Placing vcpkg.exe in the correct location" Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" -- cgit v1.2.3 From 660745956a59f58bc95b1802b2d08ddaeff37eb7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Jan 2019 18:11:08 -0800 Subject: [boost][python3] Fix building with VS 2019 --- scripts/cmake/vcpkg_test_cmake.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake index 718b2f69c..29654346a 100644 --- a/scripts/cmake/vcpkg_test_cmake.cmake +++ b/scripts/cmake/vcpkg_test_cmake.cmake @@ -27,6 +27,11 @@ function(vcpkg_test_cmake) set(PACKAGE_TYPE CONFIG) endif() + if(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") + message(STATUS "Skipping CMake integration test due to v142 / CMake interaction issues") + return() + endif() + message(STATUS "Performing CMake integration test") file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test) -- cgit v1.2.3 From ae991ee6ca224b2674aa24c7c705b5c36dcbb361 Mon Sep 17 00:00:00 2001 From: Sam Freed Date: Wed, 6 Feb 2019 13:08:57 -0800 Subject: Warn when unable to determine target architecture instead of error (#5188) * Warn when unable to determine target architecture instead of error * Make the warning not appear multiple times * fix multiple warnings for real --- scripts/buildsystems/vcpkg.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 91c196fb9..4ffb123d4 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -50,7 +50,13 @@ else() elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") set(_VCPKG_TARGET_TRIPLET_ARCH x64) else() - message(FATAL_ERROR "Unable to determine target architecture.") + if( _CMAKE_IN_TRY_COMPILE ) + message(STATUS "Unable to determine target architecture, continuing without vcpkg.") + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + endif() + set(VCPKG_TOOLCHAIN ON) + return() endif() endif() endif() -- cgit v1.2.3 From 7a18088cf2c513863761200b0d01f20be8bfa2c2 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 15 Feb 2019 14:32:07 -0800 Subject: [vcpkg create, docs] Update create command's template and documentation on patching (#5370) --- scripts/templates/portfile.in.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index e44f53aa8..33f8a4853 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -11,13 +11,24 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@) + vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" SHA512 @SHA512@ ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + 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: + # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md + # PATCHES + # 001_port_fixes.patch + # 002_more_port_fixes.patch +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From 9446cc6729a9afbdcfe010bf0408ab703eee31a9 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Fri, 22 Feb 2019 01:05:19 +0000 Subject: [x265] upgrade to 3.0, enable assembly (upgrade nasm to 2.14) (#5389) * [acquire nasm] upgrade to 2.14 * [x265] upgrade to 3.0, enable assembly * [x265] Enable assembly only on Windows --- scripts/cmake/vcpkg_find_acquire_program.cmake | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 87b6fb4fe..1f856b69e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -58,15 +58,12 @@ function(vcpkg_find_acquire_program VAR) set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26) elseif(VAR MATCHES "NASM") set(PROGNAME nasm) - set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02) + set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.14) set(BREW_PACKAGE_NAME "nasm") set(APT_PACKAGE_NAME "nasm") - set(URL - "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip" - "http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip" - ) - set(ARCHIVE "nasm-2.12.02-win32.zip") - set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36) + set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.14/win32/nasm-2.14-win32.zip") + set(ARCHIVE "nasm-2.14-win32.zip") + set(HASH 64481b0346b83de8c9568f04a54f68e0f4c71724afa0b414f12e4080951d8c49e489bfc32117f9a489e3e49477b1cadc583c672311316d27c543af304c4b7f2a) elseif(VAR MATCHES "YASM") set(PROGNAME yasm) set(SUBDIR 1.3.0.6) -- cgit v1.2.3 From 2140d3c5eb5ec5e54254db032093e7697d7ec8fe Mon Sep 17 00:00:00 2001 From: soroshsabz Date: Fri, 22 Feb 2019 22:17:48 +0330 Subject: [bootstrap.ps1] Fixed some possible incorrect comparison with null warnings. (#5343) * Fixed some possible incorrect comparison with null warnings. * Correct bad indentation. * Removed extra space. --- scripts/bootstrap.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 0a24afa05..07a9fcbaa 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -25,7 +25,7 @@ $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName) { - if ($object -eq $null) + if ($null -eq $object) { return $false } @@ -36,12 +36,12 @@ function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Par function getProgramFiles32bit() { $out = ${env:PROGRAMFILES(X86)} - if ($out -eq $null) + if ($null -eq $out) { $out = ${env:PROGRAMFILES} } - if ($out -eq $null) + if ($null -eq $out) { throw "Could not find [Program Files 32-bit]" } @@ -138,7 +138,7 @@ function getVisualStudioInstances() function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) { $VisualStudioInstances = getVisualStudioInstances - if ($VisualStudioInstances -eq $null) + if ($null -eq $VisualStudioInstances) { throw "Could not find Visual Studio. VS2015 or VS2017 (with C++) needs to be installed." } @@ -210,7 +210,7 @@ function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = # Windows 10 SDK function CheckWindows10SDK($path) { - if ($path -eq $null) + if ($null -eq $path) { return } @@ -262,7 +262,7 @@ function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = # Windows 8.1 SDK function CheckWindows81SDK($path) { - if ($path -eq $null) + if ($null -eq $path) { return } -- cgit v1.2.3