Poppler data (texstudio-org#3564)

* try relative poppler-data * fix compile
octaeder · Mar 12, 2024 · 6d1d6be · 6d1d6be
1 parent 4bd208a
commit 6d1d6be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -313,7 +313,7 @@ endif()
 # poppler
 
 find_package(PkgConfig)
-pkg_check_modules(POPPLER QUIET IMPORTED_TARGET poppler-cpp poppler-qt${QT_VERSION_MAJOR})
+pkg_check_modules(POPPLER QUIET IMPORTED_TARGET poppler poppler-cpp poppler-qt${QT_VERSION_MAJOR})
 if(POPPLER_FOUND)
     message(STATUS "Build internal pdf previewer.")
 else()

diff --git a/src/pdfviewer/pdfrendermanager.cpp b/src/pdfviewer/pdfrendermanager.cpp
@@ -16,6 +16,11 @@
 #include "configmanagerinterface.h"
 #include <QtCore/qmath.h>
 
+#ifdef Q_OS_MAC
+// enable setting datadir relative to binary on mac
+#include "GlobalParams.h"
+#endif
+
 const int kMaxPageZoom = 1000000;
 
 // maximal resolution for rendering
@@ -150,6 +155,13 @@ QSharedPointer<Poppler::Document> PDFRenderManager::loadDocument(const QString &
         return QSharedPointer<Poppler::Document>();
 	}
 
+#ifdef Q_OS_MAC
+    QDir dataDir{QCoreApplication::applicationDirPath()};
+    if (dataDir.cd(QStringLiteral("../share/poppler"))) {
+        GlobalParamsIniter::setCustomDataDir(qPrintable(dataDir.path()));
+    }
+#endif
+
     std::unique_ptr<Poppler::Document> docPtr;
 
 	HiddenByteArray ownerPassword; //for permission settings (not needed?)