Skip to content

Jessica Hawkwell / nitrogen

Go to a project
Commit 3bd6a25c by Jessica Hawkwell
Options

Fixing build system

1 parent db7f6758
Inline Side-by-side
Showing with 5 additions and 5 deletions
deps/CMakeLists.txt
...@@ -7,8 +7,8 @@ if(NOT ${RESVG} OR NOT EXISTS ${RESVG}) ...@@ -7,8 +7,8 @@ if(NOT ${RESVG} OR NOT EXISTS ${RESVG})
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(resvg-build ExternalProject_Add(resvg-build
PATCH_COMMAND sh ../patch-resvg.sh WORKING DIRECTORY deps PATCH_COMMAND sh ../../patch-resvg.sh WORKING DIRECTORY deps
SOURCE_DIR resvg SOURCE_DIR resvg/capi
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" #${CARGO} update CONFIGURE_COMMAND "" #${CARGO} update
BUILD_COMMAND ${CARGO} build --release --features=cairo-backend BUILD_COMMAND ${CARGO} build --release --features=cairo-backend
...@@ -16,11 +16,11 @@ if(NOT ${RESVG} OR NOT EXISTS ${RESVG}) ...@@ -16,11 +16,11 @@ if(NOT ${RESVG} OR NOT EXISTS ${RESVG})
) )
find_library(RESVG 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/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() endif()
message("ReSVG: " ${RESVG}) message("ReSVG: " ${RESVG})
deps/patch-resvg.sh
#!/bin/sh #!/bin/sh
if [ ! -f resvg-patched ]; then 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 touch resvg-patched
echo "ReSVG patched!" echo "ReSVG patched!"
else else
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!