Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
pinocchio
Commits
02a0d6c4
Commit
02a0d6c4
authored
Apr 11, 2016
by
jcarpent
Browse files
[CMake] Sync submodule
parent
b88eb8fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake
@
5663a002
Compare
9f9a9000
...
5663a002
Subproject commit
9f9a90007704d679c631431ab36189f7ba61f323
Subproject commit
5663a002a905b5c8d84a69d8e74044a8e34a48ed
src/CMakeLists.txt
View file @
02a0d6c4
...
...
@@ -94,7 +94,7 @@ ENDIF ( )
# ----------------------------------------------------
IF
(
EIGENPY_FOUND
)
FINDPYTHON
()
FINDPYTHON
(
2.7 EXACT REQUIRED
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/lib/python/
${
PROJECT_NAME
}
"
)
# --- COMPILE WRAPPER
...
...
@@ -114,7 +114,7 @@ IF(EIGENPY_FOUND)
IF
(
LUA5_1_FOUND
)
PKG_CONFIG_USE_DEPENDENCY
(
${
PYWRAP
}
lua5.1
)
ENDIF
(
LUA5_1_FOUND
)
TARGET_LINK_LIBRARIES
(
${
PYWRAP
}
${
Boost_LIBRARIES
}
${
PROJECT_NAME
}
)
TARGET_LINK_LIBRARIES
(
${
PYWRAP
}
${
Boost_LIBRARIES
}
${
PROJECT_NAME
}
${
PYTHON_LIBRARIES
}
)
IF
(
APPLE
)
# We need to change the extension for python bindings
...
...
travis_custom/custom_before_install
View file @
02a0d6c4
...
...
@@ -13,7 +13,7 @@ curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | sudo apt-key
sudo
free
-m
-t
# Setup environment variables.
export
APT_DEPENDENCIES
=
"doxygen libboost-dev libboost-doc libboost-thread-dev libboost-system-dev libboost-test-dev libboost-filesystem-dev libboost-python-dev libboost-program-options-dev libeigen3-dev libtinyxml-dev robotpkg-urdfdom
robotpkg-
console-bridge"
export
APT_DEPENDENCIES
=
"doxygen libboost-dev libboost-doc libboost-thread-dev libboost-system-dev libboost-test-dev libboost-filesystem-dev libboost-python-dev libboost-program-options-dev libeigen3-dev libtinyxml-dev robotpkg-urdfdom
lib
console-bridge
-dev
"
# Add Python dependency
export
APT_DEPENDENCIES
=
$APT_DEPENDENCIES
" libpython2.7 python-numpy robotpkg-eigenpy"
# Add Geometry dependencies
...
...
Write
Preview
Supports
Markdown
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