Skip to content

Commit 58516a2

Browse files
Include new wrapper files in test CmakeLists file
1 parent f4b5d7a commit 58516a2

File tree

2 files changed

+30
-18
lines changed

2 files changed

+30
-18
lines changed

lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ android {
3131
defaultConfig {
3232

3333
minSdk 33
34-
targetSdk 32
34+
targetSdk 33
3535
versionCode 1
3636
versionName "1.0"
3737

@@ -272,7 +272,7 @@ task copyBuildKiwixSoFile(type: Copy) {
272272
}
273273

274274
task createCodeCoverageReport(type: Exec) {
275-
workingDir "${projectDir}/src/androidTests/java/org/kiwix/kiwixlib/"
275+
workingDir "${projectDir}/src/test/"
276276
commandLine 'sh', '-c', "bash 'compile_and_run_test.sh' ${buildDir}/libs/*app*.jar $buildDir"
277277
}
278278

lib/src/test/CMakeLists.txt

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,30 @@ cmake_minimum_required (VERSION 3.16)
22
project (buildkiwix)
33

44
add_library(buildkiwix
5-
SHARED
6-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/base64.cpp
7-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/book.cpp
8-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/filter.cpp
9-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixicu.cpp
10-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixreader.cpp
11-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixsearcher.cpp
12-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixserver.cpp
13-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/library.cpp
14-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/manager.cpp
15-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/utils.h
5+
SHARED
6+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/book.cpp
7+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/bookmark.cpp
8+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/filter.cpp
9+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/illustration.cpp
10+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/kiwixicu.cpp
11+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/kiwixserver.cpp
12+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/library.cpp
13+
${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/manager.cpp
14+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/archive.cpp
15+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/blob.cpp
16+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/entry.cpp
17+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/entry_iterator.cpp
18+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/item.cpp
19+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/query.cpp
20+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/search.cpp
21+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/search_iterator.cpp
22+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/searcher.cpp
23+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_item.cpp
24+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_iterator.cpp
25+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_search.cpp
26+
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_searcher.cpp
27+
${PROJECT_SOURCE_DIR}/../main/cpp/utils.h
28+
${PROJECT_SOURCE_DIR}/../main/cpp/wrapper.cpp
1629
)
1730

1831
find_package(JNI)
@@ -25,11 +38,10 @@ endif()
2538
include_directories(
2639
/opt/hostedtoolcache/jdk/11.0.17/x64/include
2740
/opt/hostedtoolcache/jdk/11.0.17/x64/include/linux
28-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp
29-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/libkiwix
30-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/libzim
31-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/javah_generated
32-
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/utils
41+
${PROJECT_SOURCE_DIR}/../main/cpp
42+
${PROJECT_SOURCE_DIR}/../../build/include/libkiwix
43+
${PROJECT_SOURCE_DIR}/../../build/include/libzim
44+
${PROJECT_SOURCE_DIR}/../../build/include/javah_generated
3345
)
3446

3547
target_link_libraries(buildkiwix

0 commit comments

Comments
 (0)