Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Jessica Hawkwell
/
nitrogen
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 3bd6a25c
authored
Apr 04, 2018
by
Jessica Hawkwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing build system
1 parent
db7f6758
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
deps/CMakeLists.txt
deps/patch-resvg.sh
deps/CMakeLists.txt
View file @
3bd6a25
...
...
@@ -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
}
)
deps/patch-resvg.sh
View file @
3bd6a25
#!/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
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment