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