diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d2b6f9e7a7..4d6b1afe18 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -21,11 +21,6 @@ jobs: with: submodules: recursive - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: 'c-cpp' - - name: 🌾 Prepare variables id: vars run: | @@ -88,6 +83,11 @@ jobs: path: | ${{ env.CMAKE_BUILD_DIR }}/**/*.log + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: 'c-cpp' + - name: 🌋 Build run: | xvfb-run cmake --build "${{ env.CMAKE_BUILD_DIR }}" --config ${{ env.BUILD_TYPE }} diff --git a/vcpkg.json b/vcpkg.json index b919ab5ca2..edce801572 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -27,7 +27,17 @@ "ossl" ] }, - "qgis-qt6", + { + "name": "qca", + "default-features": false, + "host": true + }, + "qgis", + { + "name": "qgis", + "default-features": false, + "host": true + }, { "name": "qtbase", "default-features": false diff --git a/vcpkg/ports/qgis-qt6/crssync.patch b/vcpkg/ports/qgis-qt6/crssync.patch deleted file mode 100644 index f8d74fd61c..0000000000 --- a/vcpkg/ports/qgis-qt6/crssync.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ee182628c01881cc3f39e86e4b00cfc41127bd19 Mon Sep 17 00:00:00 2001 -From: Matthias Kuhn -Date: Mon, 18 Oct 2021 12:07:06 +0200 -Subject: [PATCH] No crssync on Android - ---- - src/CMakeLists.txt | 4 +- - 1 file changed, 3 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f7f32a998f..6338b1e539 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -16,7 +16,9 @@ endif() - - add_subdirectory(providers) - --add_subdirectory(crssync) -+if (NOT FORCE_STATIC_LIBS) -+ add_subdirectory(crssync) -+endif() - - if (WITH_CRASH_HANDLER) - add_subdirectory(crashhandler) --- -2.31.1 - diff --git a/vcpkg/ports/qgis/56284.patch b/vcpkg/ports/qgis/56284.patch new file mode 100644 index 0000000000..f511b6c339 --- /dev/null +++ b/vcpkg/ports/qgis/56284.patch @@ -0,0 +1,159 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb8430f3591..ee0788efe7c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -540,7 +540,11 @@ if(WITH_CORE) + endif() + + # Password helper +- find_package(QtKeychain REQUIRED) ++ if(BUILD_WITH_QT6) ++ find_package(Qt6Keychain CONFIG REQUIRED) ++ else() ++ find_package(Qt5Keychain CONFIG REQUIRED) ++ endif() + # Master password hash and authentication encryption + find_package(QCA REQUIRED) + # Check for runtime dependency of qca-ossl plugin +diff --git a/cmake/FindQtKeychain.cmake b/cmake/FindQtKeychain.cmake +deleted file mode 100644 +index a32ebff397a..00000000000 +--- a/cmake/FindQtKeychain.cmake ++++ /dev/null +@@ -1,52 +0,0 @@ +-# Find QtKeychain +-# ~~~~~~~~~~~~~~~ +-# Copyright (c) 2016, Boundless Spatial +-# Author: Larry Shaffer +-# +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +-# +-# CMake module to search for QtKeychain library from: +-# https://github.com/frankosterfeld/qtkeychain +-# +-# If it's found it sets QTKEYCHAIN_FOUND to TRUE +-# and following variables are set: +-# QTKEYCHAIN_INCLUDE_DIR +-# QTKEYCHAIN_LIBRARY +- +-FIND_PATH(QTKEYCHAIN_INCLUDE_DIR keychain.h +- PATHS +- ${LIB_DIR}/include +- "$ENV{LIB_DIR}/include" +- $ENV{INCLUDE} +- /usr/local/include +- /usr/include +- PATH_SUFFIXES ${QT_VERSION_BASE_LOWER}keychain qtkeychain +-) +- +-FIND_LIBRARY(QTKEYCHAIN_LIBRARY NAMES ${QT_VERSION_BASE_LOWER}keychain qtkeychain +- PATHS +- ${LIB_DIR} +- "$ENV{LIB_DIR}" +- $ENV{LIB_DIR}/lib +- $ENV{LIB} +- /usr/local/lib +- /usr/lib +-) +- +- +-IF (QTKEYCHAIN_INCLUDE_DIR AND QTKEYCHAIN_LIBRARY) +- SET(QTKEYCHAIN_FOUND TRUE) +-ELSE() +- SET(QTKEYCHAIN_FOUND FALSE) +-ENDIF (QTKEYCHAIN_INCLUDE_DIR AND QTKEYCHAIN_LIBRARY) +- +-IF (QTKEYCHAIN_FOUND) +- IF (NOT QTKEYCHAIN_FIND_QUIETLY) +- MESSAGE(STATUS "Found QtKeychain: ${QTKEYCHAIN_LIBRARY}") +- ENDIF (NOT QTKEYCHAIN_FIND_QUIETLY) +-ELSE (QTKEYCHAIN_FOUND) +- IF (QTKEYCHAIN_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "Could not find QtKeychain") +- ENDIF (QTKEYCHAIN_FIND_REQUIRED) +-ENDIF (QTKEYCHAIN_FOUND) +diff --git a/external/o2/src/o0keychainstore.cpp b/external/o2/src/o0keychainstore.cpp +index 2fe1d0e1ea9..d22591dce44 100644 +--- a/external/o2/src/o0keychainstore.cpp ++++ b/external/o2/src/o0keychainstore.cpp +@@ -4,7 +4,11 @@ + #include "o0keychainstore.h" + + #include +-#include ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++#include ++#else ++#include ++#endif + #include + #include + #include +diff --git a/src/auth/oauth2/CMakeLists.txt b/src/auth/oauth2/CMakeLists.txt +index 6bb0c665327..a9e2cfeddc3 100644 +--- a/src/auth/oauth2/CMakeLists.txt ++++ b/src/auth/oauth2/CMakeLists.txt +@@ -3,9 +3,6 @@ + ######################################################## + # Packages + +-if(NOT QTKEYCHAIN_FOUND) +- find_package(QtKeychain REQUIRED) +-endif() + option(WITH_INTERNAL_O2 "Download and locally include source of o2 library" ON) + + if(WITH_INTERNAL_O2) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index a802a8f6431..56f9c9e96aa 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -2416,6 +2416,16 @@ target_link_libraries(qgis_core + PROJ::proj + ) + ++if(BUILD_WITH_QT6) ++target_link_libraries(qgis_core ++ Qt6Keychain::Qt6Keychain ++) ++else() ++target_link_libraries(qgis_core ++ Qt5Keychain::Qt5Keychain ++) ++endif() ++ + if (WITH_DRACO) + target_link_libraries(qgis_core ${DRACO_LIBRARY}) + endif() +diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp +index 5948df209df..429c3e58b42 100644 +--- a/src/core/auth/qgsauthmanager.cpp ++++ b/src/core/auth/qgsauthmanager.cpp +@@ -47,9 +47,6 @@ + #include + #endif + +-// QtKeyChain library +-#include "keychain.h" +- + // QGIS includes + #include "qgsauthcertutils.h" + #include "qgsauthcrypto.h" +diff --git a/src/core/auth/qgsauthmanager.h b/src/core/auth/qgsauthmanager.h +index 6ab376d35ba..a29cc5b74ec 100644 +--- a/src/core/auth/qgsauthmanager.h ++++ b/src/core/auth/qgsauthmanager.h +@@ -38,8 +38,11 @@ + #include "qgsauthconfig.h" + #include "qgsauthmethod.h" + +-// Qt5KeyChain library +-#include "keychain.h" ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++#include ++#else ++#include ++#endif + + #ifndef SIP_RUN + namespace QCA diff --git a/vcpkg/ports/qgis/androidextras.patch b/vcpkg/ports/qgis/androidextras.patch new file mode 100644 index 0000000000..76d5792bfd --- /dev/null +++ b/vcpkg/ports/qgis/androidextras.patch @@ -0,0 +1,18 @@ +diff --color -Naur b/CMakeLists.txt QGIS-final-3_28_0/CMakeLists.txt +--- b/CMakeLists.txt 2022-10-22 19:08:22.563229185 +0200 ++++ QGIS-final-3_28_0/CMakeLists.txt 2022-10-22 19:11:24.686948005 +0200 +@@ -493,11 +493,11 @@ + else() + message(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}") + endif() ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Android" AND NOT BUILD_WITH_QT6) ++ find_package(${QT_VERSION_BASE} COMPONENTS AndroidExtras) ++ endif() + if (WITH_QUICK) + find_package(${QT_VERSION_BASE} COMPONENTS Qml Quick REQUIRED) +- if(${CMAKE_SYSTEM_NAME} MATCHES "Android" AND NOT BUILD_WITH_QT6) +- find_package(${QT_VERSION_BASE} COMPONENTS AndroidExtras) +- endif() + + # following variable is used in qgsconfig.h + set (HAVE_QUICK TRUE) diff --git a/vcpkg/ports/qgis-qt6/bigobj.patch b/vcpkg/ports/qgis/bigobj.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/bigobj.patch rename to vcpkg/ports/qgis/bigobj.patch diff --git a/vcpkg/ports/qgis/crssync-no-install.patch b/vcpkg/ports/qgis/crssync-no-install.patch new file mode 100644 index 0000000000..ed459cedeb --- /dev/null +++ b/vcpkg/ports/qgis/crssync-no-install.patch @@ -0,0 +1,12 @@ +diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt +index 278272161a9..d29045fae55 100644 +--- a/src/crssync/CMakeLists.txt ++++ b/src/crssync/CMakeLists.txt +@@ -26,7 +26,4 @@ else () + ) + endif() + +- install(CODE "message(\"Installing crssync ...\")") +- install(TARGETS crssync RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR}) +- + endif() diff --git a/vcpkg/ports/qgis-qt6/exiv2.patch b/vcpkg/ports/qgis/exiv2.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/exiv2.patch rename to vcpkg/ports/qgis/exiv2.patch diff --git a/vcpkg/ports/qgis-qt6/libxml2.patch b/vcpkg/ports/qgis/libxml2.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/libxml2.patch rename to vcpkg/ports/qgis/libxml2.patch diff --git a/vcpkg/ports/qgis-qt6/mesh.patch b/vcpkg/ports/qgis/mesh.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/mesh.patch rename to vcpkg/ports/qgis/mesh.patch diff --git a/vcpkg/ports/qgis/poly2tri1.patch b/vcpkg/ports/qgis/poly2tri1.patch new file mode 100644 index 0000000000..f9f28885b1 --- /dev/null +++ b/vcpkg/ports/qgis/poly2tri1.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2318388f5086..368c86b65476 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,7 +398,7 @@ if(WITH_CORE) + endif() + + if (NOT WITH_INTERNAL_POLY2TRI) +- find_package(Poly2Tri REQUIRED) ++ find_package(poly2tri REQUIRED) + endif() + + if (WITH_SPATIALITE) +diff --git a/cmake/FindPoly2Tri.cmake b/cmake/FindPoly2Tri.cmake +deleted file mode 100644 +index 87fb34f3475b..000000000000 +--- a/cmake/FindPoly2Tri.cmake ++++ /dev/null +@@ -1,24 +0,0 @@ +-# Find Poly2Tri +-# ~~~~~~~~~ +-# Copyright (c) 2020, Peter Petrik +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +-# +-# +-# Once run this will define: +-# Poly2Tri_FOUND - System has Poly2Tri +-# Poly2Tri_INCLUDE_DIR - The Poly2Tri include directory +-# Poly2Tri_LIBRARY - The library needed to use Poly2Tri +- +-find_path(Poly2Tri_INCLUDE_DIR poly2tri.h +- HINTS $ENV{LIB_DIR}/include) +- +-find_library(Poly2Tri_LIBRARY NAMES poly2tri libpoly2tri +- HINTS $ENV{LIB_DIR}/lib) +- +-include(FindPackageHandleStandardArgs) +- +-find_package_handle_standard_args(Poly2Tri DEFAULT_MSG +- Poly2Tri_LIBRARY Poly2Tri_INCLUDE_DIR) +- +-mark_as_advanced( Poly2Tri_INCLUDE_DIR Poly2Tri_LIBRARY ) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 1dd8bfa49bf3..9b3229480ea7 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -973,8 +973,6 @@ if (WITH_INTERNAL_POLY2TRI) + ${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/sweep.cc + ) + include_directories(${CMAKE_SOURCE_DIR}/external/poly2tri) +-else () +- include_directories(${Poly2Tri_INCLUDE_DIR}) + endif () + + file(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*") +@@ -2347,7 +2345,7 @@ if(ENABLE_MODELTEST) + endif() + + if (NOT WITH_INTERNAL_POLY2TRI) +- target_link_libraries(qgis_core ${Poly2Tri_LIBRARY}) ++ target_link_libraries(qgis_core poly2tri::poly2tri) + endif() + + if(HAVE_OPENCL) diff --git a/vcpkg/ports/qgis/poly2tri2.patch b/vcpkg/ports/qgis/poly2tri2.patch new file mode 100644 index 0000000000..860d742597 --- /dev/null +++ b/vcpkg/ports/qgis/poly2tri2.patch @@ -0,0 +1,37 @@ +diff --git a/cmake/Findpoly2tri.cmake b/cmake/Findpoly2tri.cmake +new file mode 100644 +index 000000000000..8e3c8030ac53 +--- /dev/null ++++ b/cmake/Findpoly2tri.cmake +@@ -0,0 +1,31 @@ ++# Find poly2tri ++# ~~~~~~~~~~~~~ ++# Copyright (c) 2020, Peter Petrik ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++# ++# ++# Once run this will define: ++# poly2tri_FOUND - System has poly2tri ++# poly2tri::poly2tri - Target ++ ++find_package(poly2tri CONFIG) ++if(NOT poly2tri_FOUND) ++ find_path(poly2tri_INCLUDE_DIR poly2tri.h ++ HINTS $ENV{LIB_DIR}/include) ++ ++ find_library(poly2tri_LIBRARY NAMES poly2tri libpoly2tri ++ HINTS $ENV{LIB_DIR}/lib) ++ ++ include(FindPackageHandleStandardArgs) ++ ++ find_package_handle_standard_args(poly2tri DEFAULT_MSG ++ poly2tri_LIBRARY poly2tri_INCLUDE_DIR) ++ ++ ++ add_library(poly2tri::poly2tri UNKNOWN IMPORTED) ++ target_link_libraries(poly2tri::poly2tri INTERFACE ${poly2tri_LIBRARY}) ++ target_include_directories(poly2tri::poly2tri INTERFACE ${poly2tri_INCLUDE_DIR}) ++ set_target_properties(poly2tri::poly2tri PROPERTIES IMPORTED_LOCATION ${poly2tri_LIBRARY}) ++ mark_as_advanced(poly2tri_INCLUDE_DIR poly2tri_LIBRARY) ++endif() diff --git a/vcpkg/ports/qgis-qt6/portfile.cmake b/vcpkg/ports/qgis/portfile.cmake similarity index 96% rename from vcpkg/ports/qgis-qt6/portfile.cmake rename to vcpkg/ports/qgis/portfile.cmake index 67e6a4f3d0..9c457975bd 100644 --- a/vcpkg/ports/qgis-qt6/portfile.cmake +++ b/vcpkg/ports/qgis/portfile.cmake @@ -11,11 +11,11 @@ vcpkg_from_github( qgspython.patch # Make qgis support python's debug library libxml2.patch exiv2.patch - crssync.patch bigobj.patch mesh.patch wrongattributeerrormessage.patch sts.patch # Obsolete in QGIS >= 3.36.1 + crssync-no-install.patch ) file(REMOVE ${SOURCE_PATH}/cmake/FindGDAL.cmake) @@ -137,9 +137,6 @@ if(VCPKG_TARGET_IS_WINDOWS) FIND_LIB_OPTIONS(GDAL gdal gdald LIBRARY ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) FIND_LIB_OPTIONS(POSTGRES libpq libpq LIBRARY ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) FIND_LIB_OPTIONS(QCA qca qcad LIBRARY ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - FIND_LIB_OPTIONS(ZSTD zstd_static zstd_staticd LIBRARY ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - endif() if("server" IN_LIST FEATURES) FIND_LIB_OPTIONS(FCGI libfcgi libfcgi LIBRARY ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) list(APPEND QGIS_OPTIONS -DFCGI_INCLUDE_DIR="${CURRENT_INSTALLED_DIR}/include/fastcgi") @@ -225,6 +222,11 @@ if(VCPKG_TARGET_IS_WINDOWS) copy_path(svg share) endif() +# crssync only runs when building natively. If we are cross-compiling, copy the srs.cb from the host installation. +if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET) + file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/qgis/resources/srs.db" DESTINATION "${CURRENT_PACKAGES_DIR}/share/qgis/resources") +endif() + file(GLOB QGIS_CMAKE_PATH ${CURRENT_PACKAGES_DIR}/*.cmake) if(QGIS_CMAKE_PATH) file(COPY ${QGIS_CMAKE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/qgis) diff --git a/vcpkg/ports/qgis-qt6/qgspython.patch b/vcpkg/ports/qgis/qgspython.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/qgspython.patch rename to vcpkg/ports/qgis/qgspython.patch diff --git a/vcpkg/ports/qgis-qt6/sts.patch b/vcpkg/ports/qgis/sts.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/sts.patch rename to vcpkg/ports/qgis/sts.patch diff --git a/vcpkg/ports/qgis-qt6/vcpkg.json b/vcpkg/ports/qgis/vcpkg.json similarity index 96% rename from vcpkg/ports/qgis-qt6/vcpkg.json rename to vcpkg/ports/qgis/vcpkg.json index 45df1c3408..70c4a379bf 100644 --- a/vcpkg/ports/qgis-qt6/vcpkg.json +++ b/vcpkg/ports/qgis/vcpkg.json @@ -1,10 +1,15 @@ { - "name": "qgis-qt6", + "name": "qgis", "version-string": "current", "homepage": "https://qgis.org", "description": "QGIS is a free, open source, cross platform (lin/win/mac) geographical information system (GIS)", "dependencies": [ "expat", + { + "name": "qgis", + "host": true, + "default-features": false + }, "draco", "libxml2", "libzip", diff --git a/vcpkg/ports/qgis-qt6/wrongattributeerrormessage.patch b/vcpkg/ports/qgis/wrongattributeerrormessage.patch similarity index 100% rename from vcpkg/ports/qgis-qt6/wrongattributeerrormessage.patch rename to vcpkg/ports/qgis/wrongattributeerrormessage.patch diff --git a/vcpkg/triplets/arm-android.cmake b/vcpkg/triplets/arm-android.cmake index 14336f53fc..47041d0723 100644 --- a/vcpkg/triplets/arm-android.cmake +++ b/vcpkg/triplets/arm-android.cmake @@ -1,7 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE dynamic) -include("${CMAKE_CURRENT_LIST_DIR}/static-ports-android.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/static-ports.cmake") if (PORT IN_LIST STATIC_PORTS) set(VCPKG_LIBRARY_LINKAGE static) else() diff --git a/vcpkg/triplets/arm-neon-android.cmake b/vcpkg/triplets/arm-neon-android.cmake index 001648094b..d9430e83bc 100644 --- a/vcpkg/triplets/arm-neon-android.cmake +++ b/vcpkg/triplets/arm-neon-android.cmake @@ -1,7 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE dynamic) -include("${CMAKE_CURRENT_LIST_DIR}/static-ports-android.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/static-ports.cmake") if (PORT IN_LIST STATIC_PORTS) set(VCPKG_LIBRARY_LINKAGE static) else() diff --git a/vcpkg/triplets/arm64-android.cmake b/vcpkg/triplets/arm64-android.cmake index 73d31c8406..6825738d15 100644 --- a/vcpkg/triplets/arm64-android.cmake +++ b/vcpkg/triplets/arm64-android.cmake @@ -1,7 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -include("${CMAKE_CURRENT_LIST_DIR}/static-ports-android.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/static-ports.cmake") if (PORT IN_LIST STATIC_PORTS) set(VCPKG_LIBRARY_LINKAGE static) else() diff --git a/vcpkg/triplets/static-ports-android.cmake b/vcpkg/triplets/static-ports.cmake similarity index 93% rename from vcpkg/triplets/static-ports-android.cmake rename to vcpkg/triplets/static-ports.cmake index 20604b2094..9751d62b28 100644 --- a/vcpkg/triplets/static-ports-android.cmake +++ b/vcpkg/triplets/static-ports.cmake @@ -9,6 +9,6 @@ set(STATIC_PORTS libb2 freeglut qca # OSSL plugin not discovered unless static - qgis-qt6 + qgis ffmpeg ) diff --git a/vcpkg/triplets/x64-android.cmake b/vcpkg/triplets/x64-android.cmake index 741d9c867f..cf9f687c0d 100644 --- a/vcpkg/triplets/x64-android.cmake +++ b/vcpkg/triplets/x64-android.cmake @@ -1,7 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) -include("${CMAKE_CURRENT_LIST_DIR}/static-ports-android.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/static-ports.cmake") if (PORT IN_LIST STATIC_PORTS) set(VCPKG_LIBRARY_LINKAGE static) else() diff --git a/vcpkg/triplets/x64-linux.cmake b/vcpkg/triplets/x64-linux.cmake index 302eca693c..ef7c6c5464 100644 --- a/vcpkg/triplets/x64-linux.cmake +++ b/vcpkg/triplets/x64-linux.cmake @@ -1,7 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) -include("${CMAKE_CURRENT_LIST_DIR}/static-ports-android.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/static-ports.cmake") if (PORT IN_LIST STATIC_PORTS) set(VCPKG_LIBRARY_LINKAGE static) else() diff --git a/vcpkg/triplets/x64-windows-static.cmake b/vcpkg/triplets/x64-windows-static.cmake index 66655f1877..659173930d 100644 --- a/vcpkg/triplets/x64-windows-static.cmake +++ b/vcpkg/triplets/x64-windows-static.cmake @@ -1,5 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38") # Can be removed in a future update; aligned with .github/workflows/windows.yml : ilammy/msvc-dev-cmd/toolset set(VCPKG_BUILD_TYPE release) diff --git a/vcpkg/triplets/x86-android.cmake b/vcpkg/triplets/x86-android.cmake index 20272559d8..5f806672ea 100644 --- a/vcpkg/triplets/x86-android.cmake +++ b/vcpkg/triplets/x86-android.cmake @@ -1,7 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) -include("${CMAKE_CURRENT_LIST_DIR}/static-ports-android.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/static-ports.cmake") if (PORT IN_LIST STATIC_PORTS) set(VCPKG_LIBRARY_LINKAGE static) else()