Commit 3bd6a25c by Jessica Hawkwell

Fixing build system

1 parent db7f6758
Showing with 5 additions and 5 deletions
......@@ -7,8 +7,8 @@ if(NOT ${RESVG} OR NOT EXISTS ${RESVG})
include(ExternalProject)
ExternalProject_Add(resvg-build
PATCH_COMMAND sh ../patch-resvg.sh WORKING DIRECTORY deps
SOURCE_DIR resvg
PATCH_COMMAND sh ../../patch-resvg.sh WORKING DIRECTORY deps
SOURCE_DIR resvg/capi
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" #${CARGO} update
BUILD_COMMAND ${CARGO} build --release --features=cairo-backend
......@@ -16,11 +16,11 @@ if(NOT ${RESVG} OR NOT EXISTS ${RESVG})
)
find_library(RESVG resvg
PATHS ${CMAKE_BINARY_DIR}/deps/resvg/capi/target/release/
PATHS ${CMAKE_BINARY_DIR}/deps/resvg/target/release/
)
install(FILES resvg/capi/include/resvg.h DESTINATION include)
install(FILES resvg/capi/target/release/libresvg.so DESTINATION lib)
install(FILES resvg/target/release/libresvg.so DESTINATION lib)
endif()
message("ReSVG: " ${RESVG})
#!/bin/sh
if [ ! -f resvg-patched ]; then
patch -ts capi/include/resvg.h ../patches/resvg-FreeBSD.diff
patch -ts include/resvg.h ../../patches/resvg-FreeBSD.diff
touch resvg-patched
echo "ReSVG patched!"
else
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!