Commit bbff557f8c63cd1b9405738f202b70e1067014ae

Authored by Michał Górny
1 parent 4f65c9c4

Fix build against a standard zopfli install

Fix the logic to accept a top-level `zopfli.h` header, as that is
the location used by upstream's build system.
libqpdf/CMakeLists.txt
@@ -192,7 +192,7 @@ if(NOT EXTERNAL_LIBS) @@ -192,7 +192,7 @@ if(NOT EXTERNAL_LIBS)
192 endif() 192 endif()
193 193
194 if(ZOPFLI) 194 if(ZOPFLI)
195 - find_path(ZOPFLI_H_PATH zopfli/zopfli.h) 195 + find_path(ZOPFLI_H_PATH NAMES zopfli.h PATH_SUFFIXES zopfli)
196 find_library(ZOPFLI_LIB_PATH NAMES zopfli) 196 find_library(ZOPFLI_LIB_PATH NAMES zopfli)
197 if(ZOPFLI_H_PATH AND ZOPFLI_LIB_PATH) 197 if(ZOPFLI_H_PATH AND ZOPFLI_LIB_PATH)
198 list(APPEND dep_include_directories ${ZOPFLI_H_PATH}) 198 list(APPEND dep_include_directories ${ZOPFLI_H_PATH})
libqpdf/Pl_Flate.cc
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 #include <qpdf/qpdf-config.h> 9 #include <qpdf/qpdf-config.h>
10 10
11 #ifdef ZOPFLI 11 #ifdef ZOPFLI
12 -# include <zopfli/zopfli.h> 12 +# include <zopfli.h>
13 #endif 13 #endif
14 14
15 namespace 15 namespace