3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[wpilib] update to main (#32461)

Browse Source 
* [wpilib] update to main

* Restore wpilib
This commit is contained in:
autoantwort 2023-09-14 00:33:00 +02:00 committed by GitHub
parent d173587821
commit 7f99c30261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 469 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ports/wpilib/fix-dependency-libuv.patch
View File

@ -1,32 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3930be2..f57a46b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ else()
endif()
if (USE_VCPKG_LIBUV)
-set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)")
+set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)")
endif()
if (USE_VCPKG_EIGEN)
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
index 559c8ed..0fe60e9 100644
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV)
endif()
endif()
else()
- find_package(unofficial-libuv CONFIG REQUIRED)
- target_link_libraries(wpiutil unofficial::libuv::libuv)
+ find_package(libuv CONFIG REQUIRED)
+ if (TARGET libuv::uv)
+ target_link_libraries(wpiutil libuv::uv)
+ else()
+ target_link_libraries(wpiutil libuv::uv_a)
+ endif()
endif()
if (MSVC)

44
ports/wpilib/fix-usage.patch Normal file
View File

@ -0,0 +1,44 @@
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)

12
ports/wpilib/missing-find_dependency.patch Normal file
View File

@ -0,0 +1,12 @@
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)

15
ports/wpilib/no-werror.patch Normal file
View File

@ -0,0 +1,15 @@
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

86
ports/wpilib/portfile.cmake
View File

@ -1,59 +1,59 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wpilibsuite/allwpilib
REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6
SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439
PATCHES fix-dependency-libuv.patch
REF 165ebe4c79c437c7ba6c03af4a88a8c8680f742a
SHA512 f6ee07db0a119a7ac5876c4b0cf74abfb6af635d3d3ba913300138c450f62f6595ac4849bc499346f9f0179cc563f548a5e8a9a47122af593b425af453afd99f
PATCHES
no-werror.patch
windows-install-location.patch
missing-find_dependency.patch
fix-usage.patch
)
if("allwpilib" IN_LIST FEATURES)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH_APRILTAG
REPO wpilibsuite/apriltag
REF e55b751f2465bd40a880d9acb87d24289e2af89e
SHA512 a5d824d11312f7f5229bad162349586e9c855cd1dc03f33235c045f2d5235932227eb17f9e9c801b46a28991cddcf7ad16d39549560251d7d9d52ce72f094a73
)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
INVERTED_FEATURES
cameraserver WITHOUT_CSCORE
allwpilib WITHOUT_ALLWPILIB
FEATURES
cameraserver WITH_CSCORE
allwpilib WITH_SIMULATION_MODULES
allwpilib WITH_WPILIB
)
vcpkg_find_acquire_program(PYTHON3)
x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES jinja2)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DWITHOUT_JAVA=ON
${FEATURE_OPTIONS}
-DUSE_VCPKG_LIBUV=ON
-DUSE_VCPKG_EIGEN=ON
-DFLAT_INSTALL_WPILIB=ON
${FEATURE_OPTIONS}
-DWITH_JAVA=OFF
-DWITH_EXAMPLES=OFF
-DWITH_TESTS=OFF
-DWITH_GUI=OFF
-DWITH_SIMULATION_MODULES=OFF
-DUSE_SYSTEM_FMTLIB=ON
-DUSE_SYSTEM_LIBUV=ON
-DUSE_SYSTEM_EIGEN=ON
"-DFETCHCONTENT_SOURCE_DIR_APRILTAGLIB=${SOURCE_PATH_APRILTAG}"
MAYBE_UNUSED_VARIABLES
FETCHCONTENT_SOURCE_DIR_APRILTAGLIB
)
vcpkg_cmake_install()
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
if ("allwpilib" IN_LIST FEATURES)
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/hal/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gen")
endif()
if ("cameraserver" IN_LIST FEATURES)
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
endif()
if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dll")
file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dll")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.so")
file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.so")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dylib")
file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dylib")
endif()
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.lib")
file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.lib")
file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.a")
file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.a")
vcpkg_cmake_config_fixup(PACKAGE_NAME wpilib)
vcpkg_cmake_config_fixup(PACKAGE_NAME ntcore)
vcpkg_cmake_config_fixup(PACKAGE_NAME wpimath)
vcpkg_cmake_config_fixup(PACKAGE_NAME wpinet)
vcpkg_cmake_config_fixup(PACKAGE_NAME wpiutil)
vcpkg_copy_pdbs()
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")

9
ports/wpilib/vcpkg.json
View File

@ -1,13 +1,12 @@
{
"name": "wpilib",
"version-date": "2020-03-02",
"port-version": 4,
"version-date": "2023-08-24",
"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,
"supports": "!osx",
"dependencies": [
"eigen3",
"fmt",
"libuv",
{
"name": "vcpkg-cmake",
@ -16,6 +15,10 @@
{
"name": "vcpkg-cmake-config",
"host": true
},
{
"name": "vcpkg-get-python-packages",
"host": true
}
],
"features": {

338
ports/wpilib/windows-install-location.patch Normal file
View File

@ -0,0 +1,338 @@
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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
$<INSTALL_INTERFACE:${include_dest}/apriltag>)
-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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/lib/native/include>
$<INSTALL_INTERFACE:${include_dest}/glass>)
-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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/libnt/native/include>
$<INSTALL_INTERFACE:${include_dest}/glass>)
-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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
$<INSTALL_INTERFACE:${include_dest}/wpilibNewCommands>)
-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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
$<INSTALL_INTERFACE:${include_dest}/wpimath>)
-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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
$<INSTALL_INTERFACE:${include_dest}/wpinet>)
-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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
$<INSTALL_INTERFACE:${include_dest}/wpiutil>)
-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})

9
scripts/ci.baseline.txt
View File

@ -1352,11 +1352,10 @@ workflow:arm-uwp=fail
workflow:arm64-android=fail
workflow:x64-android=fail
workflow:x64-uwp=fail
wpilib:arm-neon-android=fail
wpilib:arm64-android=fail
wpilib:arm64-windows=fail
wpilib:x64-android=fail
wpilib:x64-linux=fail
wpilib:arm-neon-android=fail # requires full c++20 support
wpilib:arm64-android=fail # requires full c++20 support
wpilib:x64-android=fail # requires full c++20 support
wpilib:x64-osx=fail # requires full c++20 support
x264:arm-neon-android=fail
x264:arm64-android=fail
x265:arm-neon-android=fail

4
versions/baseline.json
View File

@ -8833,8 +8833,8 @@
"port-version": 1
},
"wpilib": {
"baseline": "2020-03-02",
"port-version": 4
"baseline": "2023-08-24",
"port-version": 0
},
"wren": {
"baseline": "0.4.0",

5
versions/w-/wpilib.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7da141104a256a768fa72c6b3f98104904ebe45e",
"version-date": "2023-08-24",
"port-version": 0
},
{
"git-tree": "e62481ee582e81ab3ba9fe7ad99a89fa1671c230",
"version-date": "2020-03-02",