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

Remove accidental OpenCV link from wpilibc shared library (#2013)

Browse Source
This commit is contained in:
Thad House
2019-10-30 21:28:45 -07:00
committed by Peter Johnson
parent cc07425182
commit ea9bb651a3
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibc/build.gradle
View File

@@ -50,18 +50,6 @@ gradle.taskGraph.addTaskExecutionGraphListener { graph ->
}
}
ext {
sharedCvConfigs = [wpilibc : [],
wpilibcBase: [],
wpilibcDev : [],
wpilibcTest: []]
staticCvConfigs = [:]
useJava = false
useCpp = true
}
apply from: "${rootDir}/shared/opencv.gradle"
project(':').libraryBuild.dependsOn build
ext {
@@ -147,6 +135,7 @@ model {
} else {
lib project: ':cscore', library: 'cscore', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
}
}
@@ -174,6 +163,7 @@ model {
project(':hal').addHalDependency(it, 'shared')
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
}
}
}
@@ -219,6 +209,7 @@ model {
project(':hal').addHalDependency(it, 'shared')
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
lib library: nativeName, linkage: 'shared'
}
}