Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-dynamic-pinocchio
Commits
f5a401eb
Commit
f5a401eb
authored
Aug 04, 2018
by
Guilhem Saurel
Browse files
[CMake] run FINDPYTHON before SEARCH_FOR_BOOST
parent
1c4bdf02
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
f5a401eb
...
...
@@ -20,6 +20,8 @@ INCLUDE(cmake/boost.cmake)
INCLUDE
(
cmake/eigen.cmake
)
INCLUDE
(
cmake/lapack.cmake
)
INCLUDE
(
cmake/cpack.cmake
)
INCLUDE
(
custom_cmake/python.cmake
)
INCLUDE
(
cmake/python.cmake
)
SET
(
PROJECT_NAME sot-dynamic-pinocchio
)
...
...
@@ -71,6 +73,7 @@ PKG_CONFIG_APPEND_LIBS(${LIBRARY_NAME})
# Search for dependencies.
# Boost
SET
(
BOOST_COMPONENTS filesystem system unit_test_framework python
)
FINDPYTHON
()
SEARCH_FOR_BOOST
()
SEARCH_FOR_EIGEN
()
...
...
python/CMakeLists.txt
View file @
f5a401eb
INCLUDE
(
../cmake/python.cmake
)
FINDPYTHON
()
INSTALL
(
FILES kine_romeo.py kine_romeo_small.py
DESTINATION
${
PYTHON_SITELIB
}
/dynamic_graph/tutorial
...
...
src/CMakeLists.txt
View file @
f5a401eb
...
...
@@ -14,8 +14,6 @@
# received a copy of the GNU Lesser General Public License along with
# sot-dynamic-pinocchio. If not, see <http://www.gnu.org/licenses/>.
INCLUDE
(
../custom_cmake/python.cmake
)
INCLUDE
(
../cmake/python.cmake
)
LINK_DIRECTORIES
(
${
Boost_LIBRARY_DIRS
}
)
# Verbosity level
...
...
@@ -81,4 +79,4 @@ INSTALL(FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/dynamic_graph/sot/dynamics_pinocchio/tools.py
${
CMAKE_CURRENT_SOURCE_DIR
}
/dynamic_graph/sot/dynamics_pinocchio/parser.py
DESTINATION
${
PYTHON_SITELIB
}
/dynamic_graph/sot/dynamics_pinocchio
)
\ No newline at end of file
)
unitTesting/CMakeLists.txt
View file @
f5a401eb
...
...
@@ -12,7 +12,6 @@
# General Lesser Public License for more details. You should have
# received a copy of the GNU Lesser General Public License along with
# sot-dynamic-pinocchio. If not, see <http://www.gnu.org/licenses/>.
INCLUDE
(
../cmake/python.cmake
)
ADD_DEFINITIONS
(
-DDEBUG=2
)
...
...
@@ -50,8 +49,6 @@ ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
#SET(sampleinitconfig
# ${JRL_DYNAMICS_PKGDATAROOTDIR}/jrl-dynamics/examples/data/sampleInitConfig.dat)
FINDPYTHON
()
LIST
(
APPEND LOGGING_WATCHED_VARIABLES samplespec sampleljr
)
FOREACH
(
test
${
tests
}
)
...
...
@@ -60,7 +57,7 @@ FOREACH(test ${tests})
${
test
}
.cpp
)
MESSAGE
(
"PYTHON_INCLUDE_PATH:
${
PYTHON_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
PYTHON_INCLUDE_PATH
}
)
TARGET_LINK_LIBRARIES
(
${
EXECUTABLE_NAME
}
dp-zmpreffromcom
dp-force-compensation
...
...
@@ -77,7 +74,7 @@ FOREACH(test ${tests})
PKG_CONFIG_USE_DEPENDENCY
(
${
EXECUTABLE_NAME
}
sot-core
)
PKG_CONFIG_USE_DEPENDENCY
(
${
EXECUTABLE_NAME
}
dynamic-graph
)
PKG_CONFIG_USE_DEPENDENCY
(
${
EXECUTABLE_NAME
}
dynamic-graph-python
)
IF
(
${
test
}
_plugins_dependencies
)
ADD_DEPENDENCIES
(
${
EXECUTABLE_NAME
}
"
${${
test
}
_plugins_dependencies
}
"
)
TARGET_LINK_LIBRARIES
(
${
EXECUTABLE_NAME
}
"
${${
test
}
_plugins_dependencies
}
"
)
...
...
@@ -89,7 +86,7 @@ FOREACH(test ${tests})
IF
(
UNIX
)
SET
(
EXTRA_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH}
)
SET_PROPERTY
(
TEST
${
test
}
PROPERTY
SET_PROPERTY
(
TEST
${
test
}
PROPERTY
ENVIRONMENT
"LD_LIBRARY_PATH=
${
CMAKE_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
:
${
CMAKE_BINARY_DIR
}
/src:
${
BOOST_ROOT
}
/lib:
${
EXTRA_LD_LIBRARY_PATH
}
"
)
ENDIF
(
UNIX
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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