diff options
| author | Oskari Timperi <oswjk@users.noreply.github.com> | 2017-04-09 21:59:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 21:59:32 +0300 |
| commit | cdf5a1d1024e56cf09c4ff4c977209c00b1b05f8 (patch) | |
| tree | 7f507477dd29682768fb511bb2e574f8b30d5d0e | |
| parent | 69e70502c100c46cebeb69300d72b51ab355aa68 (diff) | |
| parent | dcfe8753e1acf6119b1d6f6ee2adbcc930fbcd6a (diff) | |
| download | mkpdf-cdf5a1d1024e56cf09c4ff4c977209c00b1b05f8.tar.gz mkpdf-cdf5a1d1024e56cf09c4ff4c977209c00b1b05f8.zip | |
Merge pull request #1 from oswjk/travis-fixes
Travis fixes
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | build.sh | 15 | ||||
| -rw-r--r-- | lib/luahpdf.cmake | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
4 files changed, 20 insertions, 8 deletions
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 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) 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}) |