fix

wpilibsuite · Aug 28, 2024 · 32c0046 · 32c0046
1 parent 2fa2e28
commit 32c0046
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/thirdparty/catch2/build.gradle b/thirdparty/catch2/build.gradle
@@ -38,8 +38,8 @@ model {
         "${nativeName}"(NativeLibrarySpec) {
             sources.cpp {
                 source {
-                    srcDirs "src/main/native/cpp/**/*.cpp"
-                    include '*.cpp'
+                    srcDirs "src/main/native/cpp"
+                    include '**/*.cpp'
                 }
                 exportedHeaders {
                     srcDirs 'src/main/native/include',

diff --git a/thirdparty/catch2/publish.gradle b/thirdparty/catch2/publish.gradle
@@ -15,7 +15,7 @@ task cppSourcesZip(type: Zip) {
         into '/'
     }
 
-    from('src') {
+    from('src/main/native/cpp') {
         into '/'
     }
 }
@@ -29,7 +29,7 @@ task cppHeadersZip(type: Zip) {
         into '/'
     }
 
-    from('include') {
+    from('src/main/native/include') {
         into '/'
     }
 }
@@ -42,11 +42,11 @@ addTaskToCopyAllOutputs(cppSourcesZip)
 
 model {
     publishing {
-        def googletestTaskList = createComponentZipTasks($.components, ['catch2'], zipBaseName, Zip, project, includeStandardZipFormat)
+        def catch2TaskList = createComponentZipTasks($.components, ['catch2'], zipBaseName, Zip, project, includeStandardZipFormat)
 
         publications {
             cpp(MavenPublication) {
-                googletestTaskList.each {
+                catch2TaskList.each {
                     artifact it
                 }