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