From 11759ec52b3eda2fcec7e8a38d45ee527e33bae2 Mon Sep 17 00:00:00 2001
From: Oskari Timperi <oskari.timperi@iki.fi>
Date: Sun, 9 Apr 2017 21:40:55 +0300
Subject: Fixes to luahpdf.cmake for travis

---
 lib/luahpdf.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/luahpdf.cmake b/lib/luahpdf.cmake
index a7cd7ef..d8019b5 100644
--- a/lib/luahpdf.cmake
+++ b/lib/luahpdf.cmake
@@ -8,9 +8,9 @@ FIND_PACKAGE(PNG REQUIRED)
 
 ADD_LIBRARY(luahpdf STATIC hpdf.c)
 
-TARGET_LINK_LIBRARIES(luahpdf PUBLIC ${hpdfs} lua ZLIB::ZLIB PNG::PNG)
+TARGET_LINK_LIBRARIES(luahpdf PUBLIC ${hpdfs} lua ZLIB::ZLIB ${PNG_LIBRARIES})
 
-TARGET_INCLUDE_DIRECTORIES(luahpdf PUBLIC ${CMAKE_INSTALL_PREFIX}/include)
+TARGET_INCLUDE_DIRECTORIES(luahpdf PUBLIC ${CMAKE_INSTALL_PREFIX}/include ${PNG_INCLUDE_DIRS})
 
 INSTALL(TARGETS luahpdf EXPORT luahpdf-targets DESTINATION lib)
 
-- 
cgit v1.2.3


From 43f8091e3e1aeb147335a2751212d15e6c4fae9e Mon Sep 17 00:00:00 2001
From: Oskari Timperi <oskari.timperi@iki.fi>
Date: Sun, 9 Apr 2017 21:47:13 +0300
Subject: Move build script to build.sh

---
 .travis.yml |  5 +----
 build.sh    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100755 build.sh

diff --git a/.travis.yml b/.travis.yml
index b6a3a67..1522e25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 language: c
 dist: trusty
 script:
-  - mkdir lib/build
-  - cd lib/build && cmake .. && make
-  - mkdir build
-  - cd build && cmake .. && make
+  - ./build.sh
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..fbf3299
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -ex
+
+mkdir -p lib/build
+cd lib/build
+cmake ..
+make
+
+cd ../..
+
+mkdir -p build
+cd build
+cmake ..
+make
-- 
cgit v1.2.3


From dcfe8753e1acf6119b1d6f6ee2adbcc930fbcd6a Mon Sep 17 00:00:00 2001
From: Oskari Timperi <oskari.timperi@iki.fi>
Date: Sun, 9 Apr 2017 21:55:38 +0300
Subject: Fixes to src/CMakeLists.txt for travis

---
 src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f44a92f..f106613 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,6 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mkpdf.lua.c
 
 ADD_EXECUTABLE(mkpdf main.c ${CMAKE_CURRENT_BINARY_DIR}/mkpdf.lua.c)
 
-TARGET_LINK_LIBRARIES(mkpdf PRIVATE luahpdf lua ${hpdfs} ZLIB::ZLIB PNG::PNG)
+TARGET_LINK_LIBRARIES(mkpdf PRIVATE luahpdf lua ${hpdfs} ZLIB::ZLIB ${PNG_LIBRARIES})
 
-TARGET_INCLUDE_DIRECTORIES(mkpdf PRIVATE ${PROJECT_SOURCE_DIR}/lib/stage/include)
+TARGET_INCLUDE_DIRECTORIES(mkpdf PRIVATE ${PROJECT_SOURCE_DIR}/lib/stage/include ${PNG_INCLUDE_DIRS})
-- 
cgit v1.2.3