Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-06 03:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[bazel] Link cscorestatic correctly (#8134)

Browse Source 
Statically link opencv, and make it work on all the architectures.
This commit is contained in:
Austin Schuh
2025-07-31 23:02:56 -07:00
committed by GitHub
parent 12223ff188
commit 2245dccff6
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cscore/BUILD.bazel
View File

@@ -1,5 +1,4 @@
load("@bzlmodrio-opencv//libraries/cpp/opencv:libraries.bzl", "opencv_shared_libraries") load("@bzlmodrio-opencv//libraries/cpp/opencv:libraries.bzl", "opencv_shared_libraries")
load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test") load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
load("@rules_java//java:defs.bzl", "java_binary") load("@rules_java//java:defs.bzl", "java_binary")
load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library") load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
@@ -162,7 +161,7 @@ wpilib_cc_shared_library(
deps = [":cscorejni"], deps = [":cscorejni"],
) )
cc_shared_library( wpilib_cc_shared_library(
name = "shared/cscorejnicvstatic", name = "shared/cscorejnicvstatic",
additional_linker_inputs = select({ additional_linker_inputs = select({
"@platforms//os:osx": [":cscore-mac"], "@platforms//os:osx": [":cscore-mac"],
@@ -174,17 +173,18 @@ cc_shared_library(
dynamic_deps = [ dynamic_deps = [
"//wpinet:shared/wpinet", "//wpinet:shared/wpinet",
"//wpiutil:shared/wpiutil", "//wpiutil:shared/wpiutil",
] + opencv_shared_libraries, ],
user_link_flags = select({ user_link_flags = select({
"@platforms//os:linux": [
"-Wl,-soname,libcscorejnicvstatic.so",
"-Wl,--version-script=$(location :src/main/native/LinuxSymbolScript.txt)",
],
"@platforms//os:osx": [ "@platforms//os:osx": [
"-Wl,-install_name,libcscorejnicvstatic.so", "-Wl,-install_name,libcscorejnicvstatic.so",
"-exported_symbols_list", "-exported_symbols_list",
"$(location :src/main/native/MacSymbolScript.txt)", "$(location :src/main/native/MacSymbolScript.txt)",
], ],
"//conditions:default": [ "//conditions:default": [],
"-Wl,-soname,libcscorejnicvstatic.so",
"-Wl,--version-script=$(location :src/main/native/LinuxSymbolScript.txt)",
],
}) + select({ }) + select({
"@platforms//os:osx": [ "@platforms//os:osx": [
"-Wl,-force_load,$(location :cscore-mac)", "-Wl,-force_load,$(location :cscore-mac)",
@@ -275,3 +275,13 @@ package_minimal_jni_project(
maven_artifact_name = "cscore-cpp", maven_artifact_name = "cscore-cpp",
maven_group_id = "edu.wpi.first.cscore", maven_group_id = "edu.wpi.first.cscore",
) )
alias(
name = "cscorejnicvstatic-hdrs-zip",
actual = "cscore-hdrs-zip",
)
alias(
name = "cscorejnicvstatic-srcs-zip",
actual = "cscore-srcs-zip",
)