diff --git a/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch b/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch deleted file mode 100644 index 920cf3937ffa6f..00000000000000 --- a/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ca64fff..1606e886 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -365,8 +365,8 @@ if (NOT MSVC) - # Unicode is always supported on compilers other than MSVC. - elseif (FMT_UNICODE) - # Unicode support requires compiling with /utf-8. -- target_compile_options(fmt PUBLIC $<$:/utf-8>) -- target_compile_options(fmt-header-only INTERFACE $<$:/utf-8>) -+ target_compile_options(fmt PUBLIC $<$,$>:/utf-8>) -+ target_compile_options(fmt-header-only INTERFACE $<$,$>:/utf-8>) - else () - target_compile_definitions(fmt PUBLIC FMT_UNICODE=0) - endif () --- -2.34.1 diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 66824ea20a0eba..04e2934618d06c 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 47ff6d289dcc22681eea6da465b0348172921e7cafff8fd57a1540d3232cc6b53250a4625c954ee0944c87963b17680ecbc3ea123e43c2c822efe0dc6fa6cef3 + SHA512 9ade20cedd848c6128fbbc725c62de13cf575ee2261eb469e31653a74bcd0e5473e755c3e25d3623c725faf76bdffaae9399b23987198dd2d96237f51f8dc88f HEAD_REF master PATCHES fix-write-batch.patch - fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch # remove in next release ) vcpkg_cmake_configure( diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index f2610d46f162bf..53715a66fdb419 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "11.0.2", - "port-version": 1, + "version": "11.1.0", "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 47d542ebbe5f67..e4210e3592e6a9 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,3 +1,9 @@ +vcpkg_download_distfile(FMT_PATCH + URLS https://github.com/gabime/spdlog/pull/3301/commits/e693420a38b58d29a56b3ea921e15b175a5f2843.patch?full_index=1 + FILENAME fix-fmt-e693420a38b58d29a56b3ea921e15b175a5f2843.patch + SHA512 03871e96d5d7059066f1a671381578a9430cdd26221cec9f1193d047e16b582c320511da7bce7c939301c634d1a677ff6121dffa465d32c35b3e9ee89cb3ab49 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog @@ -6,6 +12,7 @@ vcpkg_from_github( HEAD_REF v1.x PATCHES fix-msvc-utf8.patch + "${FMT_PATCH}" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 864d1217b51668..fbb82720cf1d2f 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdlog", "version-semver": "1.15.0", - "port-version": 1, + "port-version": 2, "description": "Very fast, header-only/compiled, C++ logging library.", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/ports/wpilib/fix-build-error-with-fmt11.patch b/ports/wpilib/fix-build-error-with-fmt11.patch index c33eff5d70bb89..3ad0ca3e8d7c8b 100644 --- a/ports/wpilib/fix-build-error-with-fmt11.patch +++ b/ports/wpilib/fix-build-error-with-fmt11.patch @@ -1,5 +1,5 @@ diff --git a/ntcore/src/dev/native/cpp/main.cpp b/ntcore/src/dev/native/cpp/main.cpp -index 6e43fdb..ad93644 100644 +index d724bbe..425bc4d 100644 --- a/ntcore/src/dev/native/cpp/main.cpp +++ b/ntcore/src/dev/native/cpp/main.cpp @@ -13,6 +13,7 @@ @@ -10,6 +10,82 @@ index 6e43fdb..ad93644 100644 #include #include +diff --git a/ntcore/src/main/native/cpp/LocalStorage.cpp b/ntcore/src/main/native/cpp/LocalStorage.cpp +index 7d1c3e4..0bf2711 100644 +--- a/ntcore/src/main/native/cpp/LocalStorage.cpp ++++ b/ntcore/src/main/native/cpp/LocalStorage.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include "IListenerStorage.h" + #include "Log.h" +diff --git a/ntcore/src/main/native/cpp/net/ServerImpl.cpp b/ntcore/src/main/native/cpp/net/ServerImpl.cpp +index 0a9071d..9917605 100644 +--- a/ntcore/src/main/native/cpp/net/ServerImpl.cpp ++++ b/ntcore/src/main/native/cpp/net/ServerImpl.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "IConnectionList.h" + #include "Log.h" +diff --git a/wpimath/src/main/native/include/frc/geometry/Translation2d.h b/wpimath/src/main/native/include/frc/geometry/Translation2d.h +index 9d9a77c..60a58ec 100644 +--- a/wpimath/src/main/native/include/frc/geometry/Translation2d.h ++++ b/wpimath/src/main/native/include/frc/geometry/Translation2d.h +@@ -87,7 +87,7 @@ class WPILIB_DLLEXPORT Translation2d { + * + * @return A Vector representation of this translation. + */ +- constexpr Eigen::Vector2d ToVector() const; ++ inline Eigen::Vector2d ToVector() const; + + /** + * Returns the norm, or distance from the origin to the translation. +diff --git a/wpimath/src/main/native/include/frc/geometry/Translation2d.inc b/wpimath/src/main/native/include/frc/geometry/Translation2d.inc +index 6b291e1..30ddcd4 100644 +--- a/wpimath/src/main/native/include/frc/geometry/Translation2d.inc ++++ b/wpimath/src/main/native/include/frc/geometry/Translation2d.inc +@@ -16,7 +16,7 @@ constexpr Translation2d::Translation2d(units::meter_t distance, + const Rotation2d& angle) + : m_x{distance * angle.Cos()}, m_y{distance * angle.Sin()} {} + +-constexpr Eigen::Vector2d Translation2d::ToVector() const { ++Eigen::Vector2d Translation2d::ToVector() const { + return Eigen::Vector2d{{m_x.value(), m_y.value()}}; + } + +diff --git a/wpimath/src/main/native/include/frc/geometry/Translation3d.h b/wpimath/src/main/native/include/frc/geometry/Translation3d.h +index b83b661..fa4d4d2 100644 +--- a/wpimath/src/main/native/include/frc/geometry/Translation3d.h ++++ b/wpimath/src/main/native/include/frc/geometry/Translation3d.h +@@ -94,7 +94,7 @@ class WPILIB_DLLEXPORT Translation3d { + * + * @return A Vector representation of this translation. + */ +- constexpr Eigen::Vector3d ToVector() const; ++ inline Eigen::Vector3d ToVector() const; + + /** + * Returns the norm, or distance from the origin to the translation. +diff --git a/wpimath/src/main/native/include/frc/geometry/Translation3d.inc b/wpimath/src/main/native/include/frc/geometry/Translation3d.inc +index 19268e6..2ec96f3 100644 +--- a/wpimath/src/main/native/include/frc/geometry/Translation3d.inc ++++ b/wpimath/src/main/native/include/frc/geometry/Translation3d.inc +@@ -19,7 +19,7 @@ constexpr Translation2d Translation3d::ToTranslation2d() const { + return Translation2d{m_x, m_y}; + } + +-constexpr Eigen::Vector3d Translation3d::ToVector() const { ++Eigen::Vector3d Translation3d::ToVector() const { + return Eigen::Vector3d{{m_x.value(), m_y.value(), m_z.value()}}; + } + diff --git a/wpiutil/examples/printlog/printlog.cpp b/wpiutil/examples/printlog/printlog.cpp index cb89934..4fe4817 100644 --- a/wpiutil/examples/printlog/printlog.cpp @@ -23,14 +99,22 @@ index cb89934..4fe4817 100644 #include "wpi/DataLogReader.h" #include "wpi/DenseMap.h" diff --git a/wpiutil/src/main/native/include/wpi/Logger.h b/wpiutil/src/main/native/include/wpi/Logger.h -index 01a02fd..bd524a9 100644 +index 01a02fd..45b576d 100644 --- a/wpiutil/src/main/native/include/wpi/Logger.h +++ b/wpiutil/src/main/native/include/wpi/Logger.h -@@ -9,6 +9,7 @@ - #include - - #include -+#include +@@ -66,11 +66,10 @@ class Logger { + #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments" + #endif - namespace wpi { +-#define WPI_LOG(logger_inst, level, format, ...) \ +- if ((logger_inst).HasLogger() && level >= (logger_inst).min_level()) { \ +- (logger_inst) \ +- .Log(level, __FILE__, __LINE__, \ +- FMT_STRING(format) __VA_OPT__(, ) __VA_ARGS__); \ ++#define WPI_LOG(logger_inst, level, format, ...) \ ++ if ((logger_inst).HasLogger() && level >= (logger_inst).min_level()) { \ ++ (logger_inst) \ ++ .Log(level, __FILE__, __LINE__, format __VA_OPT__(, ) __VA_ARGS__); \ + } + #define WPI_ERROR(inst, format, ...) \ diff --git a/ports/wpilib/fix-dep.patch b/ports/wpilib/fix-dep.patch new file mode 100644 index 00000000000000..c88c79345328ed --- /dev/null +++ b/ports/wpilib/fix-dep.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79df359..17e0edc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -213,7 +213,7 @@ endif() + + find_package(LIBSSH 0.7.1) + +-find_package(Protobuf REQUIRED) ++find_package(protobuf CONFIG REQUIRED) + + set(APRILTAG_DEP_REPLACE "find_dependency(apriltag)") + set(CAMERASERVER_DEP_REPLACE_IMPL "find_dependency(cameraserver)") diff --git a/ports/wpilib/fix-usage.patch b/ports/wpilib/fix-usage.patch deleted file mode 100644 index 99d22f549fcbd5..00000000000000 --- a/ports/wpilib/fix-usage.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/wpilibNewCommands/wpilibNewCommands-config.cmake.in b/wpilibNewCommands/wpilibNewCommands-config.cmake.in -index 75aa6ad7d..8a8d8d8ec 100644 ---- a/wpilibNewCommands/wpilibNewCommands-config.cmake.in -+++ b/wpilibNewCommands/wpilibNewCommands-config.cmake.in -@@ -1,5 +1,4 @@ - include(CMakeFindDependencyMacro) -- @FILENAME_DEP_REPLACE@ - @WPIUTIL_DEP_REPLACE@ - @NTCORE_DEP_REPLACE@ - @CSCORE_DEP_REPLACE@ -@@ -8,4 +7,5 @@ include(CMakeFindDependencyMacro) - @WPILIBC_DEP_REPLACE@ - @WPIMATH_DEP_REPLACE@ - -+ @FILENAME_DEP_REPLACE@ - include(${SELF_DIR}/wpilibNewCommands.cmake) -diff --git a/wpimath/wpimath-config.cmake.in b/wpimath/wpimath-config.cmake.in -index 4769e4317..9100d7943 100644 ---- a/wpimath/wpimath-config.cmake.in -+++ b/wpimath/wpimath-config.cmake.in -@@ -2,5 +2,9 @@ include(CMakeFindDependencyMacro) - @FILENAME_DEP_REPLACE@ - @WPIUTIL_DEP_REPLACE@ - -+if(@USE_SYSTEM_EIGEN@) -+ find_dependency(Eigen3) -+endif() -+ - @FILENAME_DEP_REPLACE@ - include(${SELF_DIR}/wpimath.cmake) -diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in -index fde839e2f..3f696c8a0 100644 ---- a/wpiutil/wpiutil-config.cmake.in -+++ b/wpiutil/wpiutil-config.cmake.in -@@ -4,5 +4,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) - find_dependency(Threads) - @FMTLIB_SYSTEM_REPLACE@ - -+if(@USE_SYSTEM_FMTLIB@) -+ find_dependency(fmt) -+endif() -+ - @FILENAME_DEP_REPLACE@ - include(${SELF_DIR}/wpiutil.cmake) diff --git a/ports/wpilib/missing-find_dependency.patch b/ports/wpilib/missing-find_dependency.patch deleted file mode 100644 index 06ccb909a57771..00000000000000 --- a/ports/wpilib/missing-find_dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in -index 17006a583..0a85f8b09 100644 ---- a/ntcore/ntcore-config.cmake.in -+++ b/ntcore/ntcore-config.cmake.in -@@ -1,6 +1,7 @@ - include(CMakeFindDependencyMacro) - @FILENAME_DEP_REPLACE@ - @WPIUTIL_DEP_REPLACE@ -+@WPINET_DEP_REPLACE@ - - @FILENAME_DEP_REPLACE@ - include(${SELF_DIR}/ntcore.cmake) diff --git a/ports/wpilib/no-werror.patch b/ports/wpilib/no-werror.patch deleted file mode 100644 index 8bcd6997220031..00000000000000 --- a/ports/wpilib/no-werror.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake -index 93b35b8ab..df7ff7365 100644 ---- a/cmake/modules/CompileWarnings.cmake -+++ b/cmake/modules/CompileWarnings.cmake -@@ -1,8 +1,8 @@ - macro(wpilib_target_warnings target) - if(NOT MSVC) -- target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}) -+ target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}) - else() -- target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS}) -+ target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS}) - endif() - - # Suppress C++-specific OpenCV warning; C compiler rejects it with an error diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index fed6884be711c8..1d37b7885aebb0 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -1,14 +1,14 @@ +string(REPLACE "-0" "." temp_date ${VERSION}) +string(REPLACE "-" "." formatted_date ${temp_date}) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wpilibsuite/allwpilib - REF 165ebe4c79c437c7ba6c03af4a88a8c8680f742a - SHA512 f6ee07db0a119a7ac5876c4b0cf74abfb6af635d3d3ba913300138c450f62f6595ac4849bc499346f9f0179cc563f548a5e8a9a47122af593b425af453afd99f + REF "v${formatted_date}" + SHA512 ce62bb225132aba6f22d45fce8a1a3f55d92a61a61187efd09d47a0e0c351125949ed41cc5cee0d69b5bb5b71baacfa45a9e19a33f7e69d3ae63a11e47257da4 PATCHES - no-werror.patch - windows-install-location.patch - missing-find_dependency.patch - fix-usage.patch fix-build-error-with-fmt11.patch + fix-dep.patch ) if("allwpilib" IN_LIST FEATURES) diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json index 9d54f08ff0d45f..4860cde0adb54c 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wpilib", - "version-date": "2023-08-24", - "port-version": 1, + "version-date": "2024-03-02", "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", "homepage": "https://github.com/wpilibsuite/allwpilib", "license": null, diff --git a/ports/wpilib/windows-install-location.patch b/ports/wpilib/windows-install-location.patch deleted file mode 100644 index 36087a71f0d096..00000000000000 --- a/ports/wpilib/windows-install-location.patch +++ /dev/null @@ -1,338 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 012bcb7cc..ff2ab95b8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -153,7 +153,6 @@ endif() - - set( wpilib_dest "") - set( include_dest include ) --set( main_lib_dest lib ) - set( java_lib_dest java ) - set( jni_lib_dest jni ) - -diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt -index 6f20e3aa0..b5459eb62 100644 ---- a/apriltag/CMakeLists.txt -+++ b/apriltag/CMakeLists.txt -@@ -62,11 +62,7 @@ if (WITH_JAVA) - target_link_libraries(apriltagjni PRIVATE apriltag_jni_headers) - add_dependencies(apriltagjni apriltag_jar) - -- if (MSVC) -- install(TARGETS apriltagjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) -- endif() -- -- install(TARGETS apriltagjni EXPORT apriltagjni DESTINATION "${main_lib_dest}") -+ install(TARGETS apriltagjni EXPORT apriltagjni) - - endif() - -@@ -94,13 +90,9 @@ target_include_directories(apriltag PUBLIC - $ - $) - --install(TARGETS apriltag EXPORT apriltag DESTINATION "${main_lib_dest}") -+install(TARGETS apriltag EXPORT apriltag) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/apriltag") - --if (WITH_JAVA AND MSVC) -- install(TARGETS apriltag RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) --endif() -- - if (WITH_FLAT_INSTALL) - set (apriltag_config_dir ${wpilib_dest}) - else() -diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt -index 4916be3b6..665a4ef41 100644 ---- a/cameraserver/CMakeLists.txt -+++ b/cameraserver/CMakeLists.txt -@@ -40,13 +40,9 @@ target_link_libraries(cameraserver PUBLIC ntcore cscore wpiutil ${OpenCV_LIBS}) - - set_property(TARGET cameraserver PROPERTY FOLDER "libraries") - --install(TARGETS cameraserver EXPORT cameraserver DESTINATION "${main_lib_dest}") -+install(TARGETS cameraserver EXPORT cameraserver) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cameraserver") - --if (WITH_JAVA AND MSVC) -- install(TARGETS cameraserver RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) --endif() -- - if (WITH_FLAT_INSTALL) - set (cameraserver_config_dir ${wpilib_dest}) - else() -diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt -index 81cdd4ec5..1036cdf31 100644 ---- a/cscore/CMakeLists.txt -+++ b/cscore/CMakeLists.txt -@@ -40,7 +40,7 @@ target_link_libraries(cscore PUBLIC wpinet wpiutil ${OpenCV_LIBS}) - - set_property(TARGET cscore PROPERTY FOLDER "libraries") - --install(TARGETS cscore EXPORT cscore DESTINATION "${main_lib_dest}") -+install(TARGETS cscore EXPORT cscore) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cscore") - - if (WITH_FLAT_INSTALL) -@@ -129,11 +129,7 @@ if (WITH_JAVA) - target_link_libraries(cscorejni PRIVATE cscore_jni_headers) - add_dependencies(cscorejni cscore_jar) - -- if (MSVC) -- install(TARGETS cscorejni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) -- endif() -- -- install(TARGETS cscorejni EXPORT cscorejni DESTINATION "${main_lib_dest}") -+ install(TARGETS cscorejni EXPORT cscorejni) - - endif() - -diff --git a/glass/CMakeLists.txt b/glass/CMakeLists.txt -index a252c2e83..9192bc7b4 100644 ---- a/glass/CMakeLists.txt -+++ b/glass/CMakeLists.txt -@@ -22,7 +22,7 @@ target_include_directories(libglass PUBLIC - $ - $) - --install(TARGETS libglass EXPORT libglass DESTINATION "${main_lib_dest}") -+install(TARGETS libglass EXPORT libglass) - install(DIRECTORY src/lib/native/include/ DESTINATION "${include_dest}/glass") - - # -@@ -43,7 +43,7 @@ target_include_directories(libglassnt PUBLIC - $ - $) - --install(TARGETS libglassnt EXPORT libglassnt DESTINATION "${main_lib_dest}") -+install(TARGETS libglassnt EXPORT libglassnt) - install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass") - - # -diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt -index 45c55675b..52dd44ad6 100644 ---- a/hal/CMakeLists.txt -+++ b/hal/CMakeLists.txt -@@ -55,7 +55,7 @@ target_link_libraries(hal PUBLIC wpiutil) - - set_property(TARGET hal PROPERTY FOLDER "libraries") - --install(TARGETS hal EXPORT hal DESTINATION "${main_lib_dest}") -+install(TARGETS hal EXPORT hal) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/hal") - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen/ DESTINATION "${include_dest}/hal") - -@@ -108,11 +108,7 @@ if (WITH_JAVA) - target_link_libraries(haljni PRIVATE hal_jni_headers) - add_dependencies(haljni hal_jar) - -- if (MSVC) -- install(TARGETS haljni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) -- endif() -- -- install(TARGETS haljni EXPORT haljni DESTINATION "${main_lib_dest}") -+ install(TARGETS haljni EXPORT haljni) - - endif() - -diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt -index cd5b3fb7d..1a97ac0c0 100644 ---- a/ntcore/CMakeLists.txt -+++ b/ntcore/CMakeLists.txt -@@ -33,7 +33,7 @@ target_link_libraries(ntcore PUBLIC wpinet wpiutil) - - set_property(TARGET ntcore PROPERTY FOLDER "libraries") - --install(TARGETS ntcore EXPORT ntcore DESTINATION "${main_lib_dest}") -+install(TARGETS ntcore EXPORT ntcore) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/ntcore") - install(DIRECTORY ${WPILIB_BINARY_DIR}/ntcore/generated/main/native/include/ DESTINATION "${include_dest}/ntcore") - -@@ -81,7 +81,7 @@ if (WITH_JAVA) - target_link_libraries(ntcorejni PRIVATE ntcore_jni_headers) - add_dependencies(ntcorejni ntcore_jar) - -- install(TARGETS ntcorejni EXPORT ntcorejni DESTINATION "${main_lib_dest}") -+ install(TARGETS ntcorejni EXPORT ntcorejni) - - endif() - -diff --git a/simulation/halsim_ds_socket/CMakeLists.txt b/simulation/halsim_ds_socket/CMakeLists.txt -index 6d770d9a1..4eb23bb70 100644 ---- a/simulation/halsim_ds_socket/CMakeLists.txt -+++ b/simulation/halsim_ds_socket/CMakeLists.txt -@@ -13,4 +13,4 @@ target_include_directories(halsim_ds_socket PRIVATE src/main/native/include) - - set_property(TARGET halsim_ds_socket PROPERTY FOLDER "libraries") - --install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket DESTINATION "${main_lib_dest}") -+install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket) -diff --git a/simulation/halsim_gui/CMakeLists.txt b/simulation/halsim_gui/CMakeLists.txt -index 949f9f1e8..957a9c223 100644 ---- a/simulation/halsim_gui/CMakeLists.txt -+++ b/simulation/halsim_gui/CMakeLists.txt -@@ -16,4 +16,4 @@ target_include_directories(halsim_gui PRIVATE src/main/native/include) - - set_property(TARGET halsim_gui PROPERTY FOLDER "libraries") - --install(TARGETS halsim_gui EXPORT halsim_gui DESTINATION "${main_lib_dest}") -+install(TARGETS halsim_gui EXPORT halsim_gui) -diff --git a/simulation/halsim_ws_client/CMakeLists.txt b/simulation/halsim_ws_client/CMakeLists.txt -index 5bc99dbda..18a2a120d 100644 ---- a/simulation/halsim_ws_client/CMakeLists.txt -+++ b/simulation/halsim_ws_client/CMakeLists.txt -@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_client PRIVATE src/main/native/include) - - set_property(TARGET halsim_ws_client PROPERTY FOLDER "libraries") - --install(TARGETS halsim_ws_client EXPORT halsim_ws_client DESTINATION "${main_lib_dest}") -+install(TARGETS halsim_ws_client EXPORT halsim_ws_client) -diff --git a/simulation/halsim_ws_core/CMakeLists.txt b/simulation/halsim_ws_core/CMakeLists.txt -index 91bcbb25b..f7e240fd2 100644 ---- a/simulation/halsim_ws_core/CMakeLists.txt -+++ b/simulation/halsim_ws_core/CMakeLists.txt -@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_core PUBLIC src/main/native/include) - - set_property(TARGET halsim_ws_core PROPERTY FOLDER "libraries") - --install(TARGETS halsim_ws_core EXPORT halsim_ws_core DESTINATION "${main_lib_dest}") -+install(TARGETS halsim_ws_core EXPORT halsim_ws_core) -diff --git a/simulation/halsim_ws_server/CMakeLists.txt b/simulation/halsim_ws_server/CMakeLists.txt -index e5b55c801..370d2f83f 100644 ---- a/simulation/halsim_ws_server/CMakeLists.txt -+++ b/simulation/halsim_ws_server/CMakeLists.txt -@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_server PRIVATE src/main/native/include) - - set_property(TARGET halsim_ws_server PROPERTY FOLDER "libraries") - --install(TARGETS halsim_ws_server EXPORT halsim_ws_server DESTINATION "${main_lib_dest}") -+install(TARGETS halsim_ws_server EXPORT halsim_ws_server) -diff --git a/wpigui/CMakeLists.txt b/wpigui/CMakeLists.txt -index 59c4d6faf..2a6e6b213 100644 ---- a/wpigui/CMakeLists.txt -+++ b/wpigui/CMakeLists.txt -@@ -37,7 +37,7 @@ add_executable(wpiguidev src/dev/native/cpp/main.cpp) - wpilib_link_macos_gui(wpiguidev) - target_link_libraries(wpiguidev wpigui) - --install(TARGETS wpigui EXPORT wpigui DESTINATION "${main_lib_dest}") -+install(TARGETS wpigui EXPORT wpigui) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpigui") - - #if (WITH_FLAT_INSTALL) -diff --git a/wpilibNewCommands/CMakeLists.txt b/wpilibNewCommands/CMakeLists.txt -index dc218fa06..fbebf19ea 100644 ---- a/wpilibNewCommands/CMakeLists.txt -+++ b/wpilibNewCommands/CMakeLists.txt -@@ -39,7 +39,7 @@ target_include_directories(wpilibNewCommands PUBLIC - $ - $) - --install(TARGETS wpilibNewCommands EXPORT wpilibNewCommands DESTINATION "${main_lib_dest}") -+install(TARGETS wpilibNewCommands EXPORT wpilibNewCommands) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibNewCommands") - - if (FLAT_INSTALL_WPILIB) -diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt -index 8c2c85ce9..ed8583497 100644 ---- a/wpilibc/CMakeLists.txt -+++ b/wpilibc/CMakeLists.txt -@@ -30,7 +30,7 @@ target_link_libraries(wpilibc PUBLIC hal ntcore wpimath wpiutil) - - set_property(TARGET wpilibc PROPERTY FOLDER "libraries") - --install(TARGETS wpilibc EXPORT wpilibc DESTINATION "${main_lib_dest}") -+install(TARGETS wpilibc EXPORT wpilibc) - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibc") - - if (WITH_FLAT_INSTALL) -diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt -index 01fd5d0f8..15cede1b3 100644 ---- a/wpimath/CMakeLists.txt -+++ b/wpimath/CMakeLists.txt -@@ -71,11 +71,7 @@ if (WITH_JAVA) - target_link_libraries(wpimathjni PRIVATE wpimath_jni_headers) - add_dependencies(wpimathjni wpimath_jar) - -- if (MSVC) -- install(TARGETS wpimathjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) -- endif() -- -- install(TARGETS wpimathjni EXPORT wpimathjni DESTINATION "${main_lib_dest}") -+ install(TARGETS wpimathjni EXPORT wpimathjni) - - endif() - -@@ -116,11 +112,7 @@ target_include_directories(wpimath PUBLIC - $ - $) - --install(TARGETS wpimath EXPORT wpimath DESTINATION "${main_lib_dest}") -- --if (WITH_JAVA AND MSVC) -- install(TARGETS wpimath RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) --endif() -+install(TARGETS wpimath EXPORT wpimath) - - if (WITH_FLAT_INSTALL) - set (wpimath_config_dir ${wpilib_dest}) -diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt -index 6d92a5640..c30d21827 100644 ---- a/wpinet/CMakeLists.txt -+++ b/wpinet/CMakeLists.txt -@@ -34,11 +34,7 @@ if (WITH_JAVA) - target_link_libraries(wpinetjni PRIVATE wpinet_jni_headers) - add_dependencies(wpinetjni wpinet_jar) - -- if (MSVC) -- install(TARGETS wpinetjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) -- endif() -- -- install(TARGETS wpinetjni EXPORT wpinetjni DESTINATION "${main_lib_dest}") -+ install(TARGETS wpinetjni EXPORT wpinetjni) - - endif() - -@@ -161,11 +157,7 @@ target_include_directories(wpinet PUBLIC - $ - $) - --install(TARGETS wpinet EXPORT wpinet DESTINATION "${main_lib_dest}") -- --if (WITH_JAVA AND MSVC) -- install(TARGETS wpinet RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) --endif() -+install(TARGETS wpinet EXPORT wpinet) - - if (WITH_FLAT_INSTALL) - set (wpinet_config_dir ${wpilib_dest}) -diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt -index 5db2b4c65..f6486286d 100644 ---- a/wpiutil/CMakeLists.txt -+++ b/wpiutil/CMakeLists.txt -@@ -55,11 +55,7 @@ if (WITH_JAVA) - target_link_libraries(wpiutiljni PRIVATE wpiutil_jni_headers) - add_dependencies(wpiutiljni wpiutil_jar) - -- if (MSVC) -- install(TARGETS wpiutiljni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) -- endif() -- -- install(TARGETS wpiutiljni EXPORT wpiutiljni DESTINATION "${main_lib_dest}") -+ install(TARGETS wpiutiljni EXPORT wpiutiljni) - - endif() - -@@ -161,11 +157,7 @@ target_include_directories(wpiutil PUBLIC - $ - $) - --install(TARGETS wpiutil EXPORT wpiutil DESTINATION "${main_lib_dest}") -- --if (WITH_JAVA AND MSVC) -- install(TARGETS wpiutil RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) --endif() -+install(TARGETS wpiutil EXPORT wpiutil) - - if (WITH_FLAT_INSTALL) - set (wpiutil_config_dir ${wpilib_dest}) diff --git a/versions/baseline.json b/versions/baseline.json index fd13fea6c4b5a1..6375812d8b3d46 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2865,8 +2865,8 @@ "port-version": 2 }, "fmt": { - "baseline": "11.0.2", - "port-version": 1 + "baseline": "11.1.0", + "port-version": 0 }, "folly": { "baseline": "2024.12.16.00", @@ -8602,7 +8602,7 @@ }, "spdlog": { "baseline": "1.15.0", - "port-version": 1 + "port-version": 2 }, "spectra": { "baseline": "1.0.1", @@ -9725,8 +9725,8 @@ "port-version": 0 }, "wpilib": { - "baseline": "2023-08-24", - "port-version": 1 + "baseline": "2024-03-02", + "port-version": 0 }, "wren": { "baseline": "0.4.0", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 8037abb4cc3fa6..c98ead8beb61a1 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcff0e92abc7eaa59ea10699435427b19cc41029", + "version": "11.1.0", + "port-version": 0 + }, { "git-tree": "07a73a7565e5de9eb42e90c16c133bdfdfebbcda", "version": "11.0.2", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index fcd3ae287b70af..1e405e47387153 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d22036dc840e1b08ad38ee336f1c55405736dbfe", + "version-semver": "1.15.0", + "port-version": 2 + }, { "git-tree": "72b3738962d622e47073cf4a0dc0e6ddd29d1544", "version-semver": "1.15.0", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index ebaaa231346ada..7b97b5d15e9ef2 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "181af875fb9b3a962edec931f52dedf9153c3214", + "version-date": "2024-03-02", + "port-version": 0 + }, { "git-tree": "2fcd17f46e3a3690ef340ba7da121efac75e28cc", "version-date": "2023-08-24",