Fix cpp error while compiling

Author: MohitMaliDeveloper

install_deps.sh

@@ -15,13 +15,13 @@ printf "${Green}Downloading libzim ${NC}\n"
 printf  "\n${Green}Done! ${NC}\n"
 
 printf "${Green}Coping libzim header and so files ${NC}\n"
-./gradlew checkCurrentLibzimDate copyLibzimHeaderFiles copyLibzimAndroidArm copyLibzimAndroidArm64 copyLibzimAndroidx86 copyLibzimAndroidx86_64 copyLibzimLinux_x86_64 renameLibzimSoFile
+./gradlew checkCurrentLibzimDate checkCurrentLinuxLibzimDate copyLibzimHeaderFiles copyLibzimAndroidArm copyLibzimAndroidArm64 copyLibzimAndroidx86 copyLibzimAndroidx86_64 copyLibzimLinux_x86_64 renameLibzimSoFile
 printf  "\n${Green}Down! ${NC}\n"
 
 printf "${Green}Downloading libkiwix ${NC}\n"
 ./gradlew downloadLibkiwixSoAndHeaderFiles unzipLibkiwix
 printf  "\n${Green}Done! ${NC}\n"
 
 printf "${Green}Coping libkiwix header and so files ${NC}\n"
-./gradlew checkCurrentLibkiwixDate copyLibkiwixHeaderFiles copyLibkiwixAndroidArm copyLibkiwixAndroidArm64 copyLibkiwixAndroidx86 copyLibkiwixAndroidx86_64 copyLibkiwixLinux_x86_64 renameLibkiwixSoFile
+./gradlew checkCurrentLibkiwixDate checkCurrentLinuxLibkiwixDate copyLibkiwixHeaderFiles copyLibkiwixAndroidArm copyLibkiwixAndroidArm64 copyLibkiwixAndroidx86 copyLibkiwixAndroidx86_64 copyLibkiwixLinux_x86_64 renameLibkiwixSoFile
 printf  "\n${Green}Done! ${NC}\n"

lib/build.gradle

@@ -79,7 +79,9 @@ ext.libkiwix_base_url = 'https://download.kiwix.org/nightly'
 ext.libzim_base_url = 'https://download.openzim.org/nightly'
 // change this date to get latest libzim .so and header files
 ext.nightly_date_for_libkiwix = project.properties["nightly_date_for_libkiwix"] ?: ""
+ext.nightly_date_for_libkiwix_linux = project.properties["nightly_date_for_libkiwix_linux"] ?: ""
 ext.nightly_date_for_libzim = project.properties["nightly_date_for_libzim"] ?: ""
+ext.nightly_date_for_libzim_linux = project.properties["nightly_date_for_libzim_linux"] ?: ""
 
 ext.libkiwix_version = project.properties["libkiwix_version"] ?: ""
 ext.libzim_version = project.properties["libzim_version"] ?: ""
@@ -100,6 +102,10 @@ task checkCurrentLibzimDate() {
     project.ext.set("nightly_date_for_libzim", getDateFromPath(buildDir.path, "libzim_android-arm64-"))
 }
 
+task checkCurrentLinuxLibzimDate() {
+    project.ext.set("nightly_date_for_libzim_linux", getDateFromPath(buildDir.path, "libzim_linux-x86_64-"))
+}
+
 task unzipLibzim(type: Copy) {
     // unzip android arm
     from tarTree(buildDir.path + "/libzim_android-arm.tar.gz")
@@ -150,8 +156,8 @@ task copyLibzimAndroidx86_64(type: Copy) {
 
 task copyLibzimLinux_x86_64(type: Copy) {
     // copying linux_x86_64 so file
-    project.ext.set("libzim_version", getFileFromFolder(buildDir.path + "/libzim_linux-x86_64-" + nightly_date_for_libzim + "/lib/x86_64-linux-gnu/"))
-    from buildDir.path + "/libzim_linux-x86_64-" + nightly_date_for_libzim + "/lib/x86_64-linux-gnu/" + libzim_version
+    project.ext.set("libzim_version", getFileFromFolder(buildDir.path + "/libzim_linux-x86_64-" + nightly_date_for_libzim_linux + "/lib/x86_64-linux-gnu/"))
+    from buildDir.path + "/libzim_linux-x86_64-" + nightly_date_for_libzim_linux + "/lib/x86_64-linux-gnu/" + libzim_version
     into buildDir.path
 }
 
@@ -180,6 +186,10 @@ task checkCurrentLibkiwixDate() {
     project.ext.set("nightly_date_for_libkiwix", getDateFromPath(buildDir.path, "libkiwix_android-arm64-"))
 }
 
+task checkCurrentLinuxLibkiwixDate() {
+    project.ext.set("nightly_date_for_libkiwix_linux", getDateFromPath(buildDir.path, "libkiwix_linux-x86_64-"))
+}
+
 static String getDateFromPath(String path, String matchesString) {
     File folder = new File(path)
     if (folder.exists()) {
@@ -241,8 +251,8 @@ task copyLibkiwixAndroidx86_64(type: Copy) {
 
 task copyLibkiwixLinux_x86_64(type: Copy) {
     // copying linux_x86_64 so file
-    project.ext.set("libkiwix_version", getFileFromFolder(buildDir.path + "/libkiwix_linux-x86_64-" + nightly_date_for_libkiwix + "/lib/x86_64-linux-gnu/"))
-    from buildDir.path + "/libkiwix_linux-x86_64-" + nightly_date_for_libkiwix + "/lib/x86_64-linux-gnu/" + libkiwix_version
+    project.ext.set("libkiwix_version", getFileFromFolder(buildDir.path + "/libkiwix_linux-x86_64-" + nightly_date_for_libkiwix_linux + "/lib/x86_64-linux-gnu/"))
+    from buildDir.path + "/libkiwix_linux-x86_64-" + nightly_date_for_libkiwix_linux + "/lib/x86_64-linux-gnu/" + libkiwix_version
     into buildDir.path
 }
 

lib/src/main/cpp/utils.h

@@ -25,6 +25,8 @@
 #include <jni.h>
 
 #include <mutex>
+#include <memory>
+#include <cassert>
 #include <string>
 #include <vector>
 #include <set>

lib/src/test/CMakeLists.txt

@@ -44,7 +44,7 @@ ${PROJECT_SOURCE_DIR}/../../build/include/javah_generated
 )
 
 target_link_libraries(buildkiwix
-LINK_PUBLIC 
-${CMAKE_SOURCE_DIR}/../../../../../../build/libkiwix.so
-${CMAKE_SOURCE_DIR}/../../../../../../build/libzim.so
+LINK_PUBLIC
+${PROJECT_SOURCE_DIR}/../../build/libkiwix.so
+${PROJECT_SOURCE_DIR}/../../build/libzim.so
 )