Skip to content

Commit f4776ea

Browse files
committed
fix?
1 parent cc69f2d commit f4776ea

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

shared/catch2.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
model {
2+
binaries {
3+
withType(GoogleTestTestSuiteBinarySpec).all {
4+
lib project: ':thirdparty:catch2', library: 'catch2', linkage: 'static'
5+
}
6+
}
7+
}

shared/javacpp/setupBuild.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ ext {
2323
staticGtestConfigs["${nativeName}Test"] = []
2424

2525
apply from: "${rootDir}/shared/googletest.gradle"
26+
apply from: "${rootDir}/shared/catch2.gradle"
2627

2728
model {
2829
components {

shared/jni/setupBuild.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ ext {
3131
staticGtestConfigs["${nativeName}Test"] = []
3232

3333
apply from: "${rootDir}/shared/googletest.gradle"
34+
apply from: "${rootDir}/shared/catch2.gradle"
3435

3536
model {
3637
components {

wpiutil/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ model {
249249
targetBuildTypes 'debug'
250250
binaries.all {
251251
lib library: 'wpiutil', linkage: 'shared'
252-
lib project: ':thirdparty:catch2', library: 'catch2', linkage: 'static'
253252
}
254253
sources {
255254
cpp {

0 commit comments

Comments
 (0)