fix?

wpilibsuite · Aug 27, 2024 · f4776ea · f4776ea
1 parent cc69f2d
commit f4776ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
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/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
@@ -31,6 +31,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 {