Second attempt at fixing the windows/craft build

Since libspectre includes reference themselves with libspectre/ change
the cmake find_path to also include libspectre/ when doing the include
path search
remotes/origin/work/aacid/okular_focus_actions
Albert Astals Cid 5 years ago
parent 108e568d67
commit 99788b907e
  1. 3
      cmake/modules/FindLibSpectre.cmake
  2. 2
      generators/spectre/generator_ghostview.h
  3. 2
      generators/spectre/rendererthread.h

@ -34,9 +34,8 @@ if(_pc_LIBSPECTRE_FOUND)
HINTS ${_pc_LIBSPECTRE_LIBRARY_DIRS} ${CMAKE_LIBRARY_PATH}
)
find_path(LIBSPECTRE_INCLUDE_DIR spectre.h
find_path(LIBSPECTRE_INCLUDE_DIR libspectre/spectre.h
HINTS ${_pc_LIBSPECTRE_INCLUDE_DIRS}
PATH_SUFFIXES libspectre
)
set(LIBSPECTRE_INTERNAL_FOUND TRUE)

@ -13,7 +13,7 @@
#include <core/generator.h>
#include <interfaces/configinterface.h>
#include <spectre.h>
#include <libspectre/spectre.h>
class GSGenerator : public Okular::Generator, public Okular::ConfigInterface
{

@ -16,7 +16,7 @@
#include <QString>
#include <QThread>
#include <spectre.h>
#include <libspectre/spectre.h>
class QImage;
class GSGenerator;

Loading…
Cancel
Save