1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 191ff732..4a50f7de 100644
5 @@ -71,6 +71,7 @@ endif()
8 add_subdirectory(libs/rapidfuzz-cpp)
9 +include_directories(@nixMupdfIncludePath@)
13 diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
14 index 0a41c5fd..f8714715 100644
15 --- a/src/application/CMakeLists.txt
16 +++ b/src/application/CMakeLists.txt
17 @@ -107,7 +107,7 @@ if(ANDROID)
21 - set(MUPDF_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/libs/mupdf/build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release>")
22 + set(MUPDF_OUTPUT_DIR "@nixMupdfLibPath@")
23 set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so")
24 set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so" PARENT_SCOPE)
25 set(MUPDF_BUILD_COMMAND ./scripts/mupdfwrap.py ${VENV_OPTION} -d build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release> -b --m-target 'libs tools' ${EXTRA_MAKE_AGRS} -j 0 m01)
26 @@ -145,21 +145,6 @@ else()
27 set(EXECUTABLE_EXTENSION ".exe")
30 -add_custom_target(mupdf
32 - COMMAND ${CMAKE_COMMAND} -E env
33 - ${ANDROID_COMPILERS}
34 - "USE_SYSTEM_LIBJPEG=${USE_SYSTEM_LIBJPEG_VALUE}"
36 - ${MUPDF_BUILD_COMMAND}
37 - # Copy mutool to the build directory
38 - COMMAND ${CMAKE_COMMAND} -E copy
39 - "${MUPDF_OUTPUT_DIR}/mutool${EXECUTABLE_EXTENSION}"
40 - "${PROJECT_BINARY_DIR}/mutool${EXECUTABLE_EXTENSION}"
41 - BYPRODUCTS ${MUPDF_OUTPUT}
42 - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/libs/mupdf
43 - COMMENT "Building mupdf (This takes a while) ..."
47 #Copy the mupdf dlls to the build directory for windows
48 @@ -182,7 +167,6 @@ add_library(application
52 -add_dependencies(application mupdf) # Ensure the mupdf target is built before the application target
54 target_compile_definitions(application PRIVATE APPLICATION_LIBRARY)
56 @@ -202,11 +186,6 @@ target_include_directories(application
57 ${CMAKE_CURRENT_SOURCE_DIR}/core/utils
60 -# Make sure to ignore warnings from mupdf by adding it as a system include directory
61 -target_include_directories(application SYSTEM PUBLIC
62 - ${PROJECT_SOURCE_DIR}/libs/mupdf/platform/c++/include
63 - ${PROJECT_SOURCE_DIR}/libs/mupdf/include
66 target_compile_definitions(application
68 @@ -251,29 +230,10 @@ if(LINUX)
72 - # Install mupdf's shared libraries
73 - install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so
74 - ${MUPDF_OUTPUT_DIR}/libmupdf.so
75 - ${MUPDF_OUTPUT_DIR}/mutool${EXECUTABLE_EXTENSION}
78 - # Install links with correct permissions
79 - if(EXISTS "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so.24.0")
80 - install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so.24.0
81 - ${MUPDF_OUTPUT_DIR}/libmupdf.so.24.0
82 - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
83 - GROUP_READ GROUP_EXECUTE
84 - WORLD_READ WORLD_EXECUTE
89 install(TARGETS application
93 - # Install mupdf's shared libraries
94 - install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so
95 - ${MUPDF_OUTPUT_DIR}/libmupdf.dylib