fix?

spacey-sooty · spacey-sooty · commit 5deccdce3df3 · 2024-08-27T21:13:26.000+08:00
diff --git a/shared/catch2.gradle b/shared/catch2.gradle
@@ -0,0 +1,7 @@
+model {
+    binaries {
+        withType(GoogleTestTestSuiteBinarySpec).all {
+            lib project: ':thirdparty:catch2', library: 'catch2', linkage: 'static'
+        }
+    }
+}
diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle
@@ -23,6 +23,7 @@ ext {
 staticGtestConfigs["${nativeName}Test"] = []
 
 apply from: "${rootDir}/shared/googletest.gradle"
+apply from: "${rootDir}/shared/catch2.gradle"
 
 model {
     components {
diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
@@ -249,7 +249,6 @@ model {
                 targetBuildTypes 'debug'
                 binaries.all {
                     lib library: 'wpiutil', linkage: 'shared'
-                    lib project: ':thirdparty:catch2', library: 'catch2', linkage: 'static'
                 }
                 sources {
                     cpp {

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,6 @@ model {`
`249`	`249`	`targetBuildTypes 'debug'`
`250`	`250`	`binaries.all {`
`251`	`251`	`lib library: 'wpiutil', linkage: 'shared'`
`252`		`- lib project: ':thirdparty:catch2', library: 'catch2', linkage: 'static'`
`253`	`252`	`}`
`254`	`253`	`sources {`
`255`	`254`	`cpp {`