Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
labrobotica
drivers
dynamixel
Commits
71f13e9a
Commit
71f13e9a
authored
May 16, 2019
by
Alejandro Lopez Gestoso
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added libboost-all-dev cpack dependency
parent
74b51819
Pipeline
#3369
failed with stages
in 1 minute and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
CMakeLists.txt
CMakeLists.txt
+2
-2
No files found.
.gitlab-ci.yml
View file @
71f13e9a
...
...
@@ -13,7 +13,7 @@ build-package:
# - apt-get -y --allow-unauthenticated install iri-<package_name>-dev
-
apt-get update
-
apt-get -y --allow-unauthenticated install iri-iriutils-dev iri-comm-dev
-
apt-get install -y libxerces-c-dev xsdcxx
-
apt-get install -y libxerces-c-dev xsdcxx
libboost-all-dev
-
mkdir -pv build
-
cd build
-
cmake -D CMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG ..
...
...
CMakeLists.txt
View file @
71f13e9a
...
...
@@ -81,7 +81,7 @@ ELSE ()
ENDIF
()
IF
(
UNIX
)
SET
(
CPACK_PACKAGE_FILE_NAME
"iri-
${
PACKAGE_NAME
}
-dev-
${
CPACK_PACKAGE_VERSION
}${
CPACK_DEBIAN_PACKAGE_ARCHITECTURE
}
"
)
SET
(
CPACK_PACKAGE_FILE_NAME
"iri-
${
PACKAGE_NAME
}
-dev-
${
CPACK_PACKAGE_VERSION
}
-
${
CPACK_DEBIAN_PACKAGE_ARCHITECTURE
}
"
)
SET
(
CPACK_PACKAGE_NAME
"iri-
${
PACKAGE_NAME
}
-dev"
)
SET
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"Part of IRI-laboratory libraries. More information at http://wiki.iri.upc.edu/index.php/LabRobotica"
)
SET
(
CPACK_PACKAGING_INSTALL_PREFIX /usr
)
...
...
@@ -93,7 +93,7 @@ IF (UNIX)
# Uncomment to add dependencies comma separated
# SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-<package_name>-dev (>= 1.0~${DISTRIB})")
SET
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"iri-iriutils-dev (>= 1.0~
${
DISTRIB
}
), iri-comm-dev (>= 1.0~
${
DISTRIB
}
), libxerces-c-dev (>= 1.0~
${
DISTRIB
}
), xsdcxx (>= 1.0~
${
DISTRIB
}
)"
)
SET
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"iri-iriutils-dev (>= 1.0~
${
DISTRIB
}
), iri-comm-dev (>= 1.0~
${
DISTRIB
}
), libxerces-c-dev (>= 1.0~
${
DISTRIB
}
), xsdcxx (>=
1.0~
${
DISTRIB
}
), libboost-all-dev (>=
1.0~
${
DISTRIB
}
)"
)
INCLUDE
(
CPack
)
ELSE
(
UNIX
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
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 comment