Include new wrapper files in test CmakeLists file

This commit is contained in:
MohitMali 2023-03-03 16:08:53 +05:30
parent 4b5cc44577
commit 49de5c457e
2 changed files with 32 additions and 20 deletions

View File

@ -26,12 +26,12 @@ ext {
apply from: 'publish.gradle' apply from: 'publish.gradle'
android { android {
compileSdk 32 compileSdk 33
defaultConfig { defaultConfig {
minSdk 21 minSdk 33
targetSdk 32 targetSdk 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@ -272,7 +272,7 @@ task copyBuildKiwixSoFile(type: Copy) {
} }
task createCodeCoverageReport(type: Exec) { task createCodeCoverageReport(type: Exec) {
workingDir "${projectDir}/src/androidTests/java/org/kiwix/kiwixlib/" workingDir "${projectDir}/src/test/"
commandLine 'sh', '-c', "bash 'compile_and_run_test.sh' ${buildDir}/libs/*app*.jar $buildDir" commandLine 'sh', '-c', "bash 'compile_and_run_test.sh' ${buildDir}/libs/*app*.jar $buildDir"
} }

View File

@ -2,17 +2,30 @@ cmake_minimum_required (VERSION 3.16)
project (buildkiwix) project (buildkiwix)
add_library(buildkiwix add_library(buildkiwix
SHARED SHARED
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/base64.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/book.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/book.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/bookmark.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/filter.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/filter.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixicu.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/illustration.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixreader.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/kiwixicu.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixsearcher.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/kiwixserver.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/kiwixserver.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/library.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/library.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libkiwix/manager.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/manager.cpp ${PROJECT_SOURCE_DIR}/../main/cpp/libzim/archive.cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/utils.h ${PROJECT_SOURCE_DIR}/../main/cpp/libzim/blob.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/entry.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/entry_iterator.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/item.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/query.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/search.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/search_iterator.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/searcher.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_item.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_iterator.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_search.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/libzim/suggestion_searcher.cpp
${PROJECT_SOURCE_DIR}/../main/cpp/utils.h
${PROJECT_SOURCE_DIR}/../main/cpp/wrapper.cpp
) )
find_package(JNI) find_package(JNI)
@ -25,11 +38,10 @@ endif()
include_directories( include_directories(
/opt/hostedtoolcache/jdk/11.0.17/x64/include /opt/hostedtoolcache/jdk/11.0.17/x64/include
/opt/hostedtoolcache/jdk/11.0.17/x64/include/linux /opt/hostedtoolcache/jdk/11.0.17/x64/include/linux
${CMAKE_SOURCE_DIR}/../../../../../main/cpp ${PROJECT_SOURCE_DIR}/../main/cpp
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/libkiwix ${PROJECT_SOURCE_DIR}/../../build/include/libkiwix
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/libzim ${PROJECT_SOURCE_DIR}/../../build/include/libzim
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/javah_generated ${PROJECT_SOURCE_DIR}/../../build/include/javah_generated
${CMAKE_SOURCE_DIR}/../../../../../main/cpp/include/utils
) )
target_link_libraries(buildkiwix target_link_libraries(buildkiwix