gradle

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

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/thirdparty/catch2/build.gradle b/thirdparty/catch2/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'visual-studio'
 apply plugin: 'edu.wpi.first.NativeUtils'
 
 ext {
-    nativeName = 'Catch2'
+    nativeName = 'catch2'
 }
 
 apply from: "${rootDir}/shared/config.gradle"
@@ -13,7 +13,7 @@ def catch2UserConfigOutput  = file("$buildDir/generated-includes/catch2/catch_us
 
 task generateCatchUserConfig() {
     description = 'Generates the Catch2 user config file.'
-    group = 'Catch2'
+    group = 'catch2'
 
     outputs.file catch2UserConfigOutput
     inputs.file catch2UserConfigInput

diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
@@ -249,6 +249,7 @@ model {
                 targetBuildTypes 'debug'
                 binaries.all {
                     lib library: 'wpiutil', linkage: 'shared'
+                    lib project: ':thirdparty:catch2', library: 'catch2', linkage: 'static'
                 }
                 sources {
                     cpp {