Skip to content

Commit 658011c

Browse files
committed
fix
1 parent 14f47af commit 658011c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

thirdparty/catch2/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ model {
3838
"${nativeName}"(NativeLibrarySpec) {
3939
sources.cpp {
4040
source {
41-
srcDirs "src/main/native/cpp/**/*.cpp"
42-
include '*.cpp'
41+
srcDirs "src/main/native/cpp"
42+
include '**/*.cpp'
4343
}
4444
exportedHeaders {
4545
srcDirs 'src/main/native/include',

thirdparty/catch2/publish.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task cppSourcesZip(type: Zip) {
1515
into '/'
1616
}
1717

18-
from('src') {
18+
from('src/main/native/cpp') {
1919
into '/'
2020
}
2121
}
@@ -29,7 +29,7 @@ task cppHeadersZip(type: Zip) {
2929
into '/'
3030
}
3131

32-
from('include') {
32+
from('src/main/native/include') {
3333
into '/'
3434
}
3535
}
@@ -42,11 +42,11 @@ addTaskToCopyAllOutputs(cppSourcesZip)
4242

4343
model {
4444
publishing {
45-
def googletestTaskList = createComponentZipTasks($.components, ['catch2'], zipBaseName, Zip, project, includeStandardZipFormat)
45+
def catch2TaskList = createComponentZipTasks($.components, ['catch2'], zipBaseName, Zip, project, includeStandardZipFormat)
4646

4747
publications {
4848
cpp(MavenPublication) {
49-
googletestTaskList.each {
49+
catch2TaskList.each {
5050
artifact it
5151
}
5252

0 commit comments

Comments
 (0)