Skip to content

Commit b8d2005

Browse files
authored
Fix duplicate libraries (#101)
1 parent d333c78 commit b8d2005

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,9 @@ if (project.platform == "linux-arm64") {
377377
destinationDir = stripCopyDir
378378

379379
from(buildDirectory.resolve("lib").toFile()) {
380+
// Include libopencv<...>.so.SOVERSION, but not libopencv<...>.so.MAJOR.MINOR.PATCH
380381
include '*.so.*'
382+
exclude "*.so.${project.ext.version}".toString()
381383
exclude 'cv2.so'
382384
exclude '**/*dephelp*'
383385
}

publish.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publishing {
1313
}
1414
}
1515

16-
def pubVersion = "2027-${project.ext.version}-2"
16+
def pubVersion = "2027-${project.ext.version}-3"
1717

1818
def outputsFolder = file("$project.buildDir/outputs")
1919

@@ -139,13 +139,17 @@ task cppHeadersZip(type: Zip, dependsOn: make) {
139139
}
140140
from(resolvedDir.toFile()) {
141141
into project.platformPath + '/shared'
142+
// Include libopencv<...>.so.SOVERSION, but not libopencv<...>.so.MAJOR.MINOR.PATCH
142143
include '*.so.*'
144+
exclude "*.so.${project.ext.version}".toString()
143145
exclude 'cv2.so'
144146
exclude '**/*dephelp*'
145147
}
146148
from(resolvedDir.toFile()) {
147149
into project.platformPath + '/shared'
148-
include "*.${project.ext.version}.dylib".toString()
150+
// Include libopencv<...>.SOVERSION.dylib, but not libopencv<...>.MAJOR.MINOR.PATCH.dylib
151+
include '*.*.dylib'
152+
exclude "*.${project.ext.version}.dylib".toString()
149153
exclude 'cv2.so'
150154
exclude '**/*dephelp*'
151155
}

0 commit comments

Comments
 (0)