Correct NO_PNG compilation.

Correct a couple of minor omissions which prevented compiling
without PNG support.
This commit is contained in:
Robin Stuart 2011-01-02 21:56:30 +00:00
parent bac1bfe09b
commit 0927fa6237
2 changed files with 2 additions and 1 deletions

View File

@ -22,6 +22,7 @@ set_target_properties(zint PROPERTIES SOVERSION "${ZINT_VERSION_MAJOR}.${ZINT_V
VERSION ${ZINT_VERSION}) VERSION ${ZINT_VERSION})
target_link_libraries(zint ${PNG_LIBRARIES} ) target_link_libraries(zint ${PNG_LIBRARIES} )
target_link_libraries(zint -lm)
install(TARGETS zint ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS zint ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES zint.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(FILES zint.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)

View File

@ -34,8 +34,8 @@
#ifndef NO_PNG #ifndef NO_PNG
#include "png.h" /* libpng header; includes zlib.h and setjmp.h */ #include "png.h" /* libpng header; includes zlib.h and setjmp.h */
#include "maxipng.h" /* Maxicode shapes */
#endif /* NO_PNG */ #endif /* NO_PNG */
#include "maxipng.h" /* Maxicode shapes */
#include "font.h" /* Font for human readable text */ #include "font.h" /* Font for human readable text */