Commit f5a401eb authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CMake] run FINDPYTHON before SEARCH_FOR_BOOST

parent 1c4bdf02
...@@ -20,6 +20,8 @@ INCLUDE(cmake/boost.cmake) ...@@ -20,6 +20,8 @@ INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/eigen.cmake) INCLUDE(cmake/eigen.cmake)
INCLUDE(cmake/lapack.cmake) INCLUDE(cmake/lapack.cmake)
INCLUDE(cmake/cpack.cmake) INCLUDE(cmake/cpack.cmake)
INCLUDE(custom_cmake/python.cmake)
INCLUDE(cmake/python.cmake)
SET(PROJECT_NAME sot-dynamic-pinocchio) SET(PROJECT_NAME sot-dynamic-pinocchio)
...@@ -71,6 +73,7 @@ PKG_CONFIG_APPEND_LIBS(${LIBRARY_NAME}) ...@@ -71,6 +73,7 @@ PKG_CONFIG_APPEND_LIBS(${LIBRARY_NAME})
# Search for dependencies. # Search for dependencies.
# Boost # Boost
SET(BOOST_COMPONENTS filesystem system unit_test_framework python) SET(BOOST_COMPONENTS filesystem system unit_test_framework python)
FINDPYTHON()
SEARCH_FOR_BOOST() SEARCH_FOR_BOOST()
SEARCH_FOR_EIGEN() SEARCH_FOR_EIGEN()
......
INCLUDE(../cmake/python.cmake)
FINDPYTHON()
INSTALL( INSTALL(
FILES kine_romeo.py kine_romeo_small.py FILES kine_romeo.py kine_romeo_small.py
DESTINATION ${PYTHON_SITELIB}/dynamic_graph/tutorial DESTINATION ${PYTHON_SITELIB}/dynamic_graph/tutorial
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# received a copy of the GNU Lesser General Public License along with # received a copy of the GNU Lesser General Public License along with
# sot-dynamic-pinocchio. If not, see <http://www.gnu.org/licenses/>. # 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}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
# Verbosity level # Verbosity level
...@@ -81,4 +79,4 @@ INSTALL(FILES ...@@ -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/tools.py
${CMAKE_CURRENT_SOURCE_DIR}/dynamic_graph/sot/dynamics_pinocchio/parser.py ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_graph/sot/dynamics_pinocchio/parser.py
DESTINATION ${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio DESTINATION ${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio
) )
\ No newline at end of file
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
# General Lesser Public License for more details. You should have # General Lesser Public License for more details. You should have
# received a copy of the GNU Lesser General Public License along with # received a copy of the GNU Lesser General Public License along with
# sot-dynamic-pinocchio. If not, see <http://www.gnu.org/licenses/>. # sot-dynamic-pinocchio. If not, see <http://www.gnu.org/licenses/>.
INCLUDE(../cmake/python.cmake)
ADD_DEFINITIONS(-DDEBUG=2) ADD_DEFINITIONS(-DDEBUG=2)
...@@ -50,8 +49,6 @@ ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN) ...@@ -50,8 +49,6 @@ ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
#SET(sampleinitconfig #SET(sampleinitconfig
# ${JRL_DYNAMICS_PKGDATAROOTDIR}/jrl-dynamics/examples/data/sampleInitConfig.dat) # ${JRL_DYNAMICS_PKGDATAROOTDIR}/jrl-dynamics/examples/data/sampleInitConfig.dat)
FINDPYTHON()
LIST(APPEND LOGGING_WATCHED_VARIABLES samplespec sampleljr) LIST(APPEND LOGGING_WATCHED_VARIABLES samplespec sampleljr)
FOREACH(test ${tests}) FOREACH(test ${tests})
...@@ -60,7 +57,7 @@ FOREACH(test ${tests}) ...@@ -60,7 +57,7 @@ FOREACH(test ${tests})
${test}.cpp) ${test}.cpp)
MESSAGE("PYTHON_INCLUDE_PATH: ${PYTHON_INCLUDE_PATH}") MESSAGE("PYTHON_INCLUDE_PATH: ${PYTHON_INCLUDE_PATH}")
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
dp-zmpreffromcom dp-zmpreffromcom
dp-force-compensation dp-force-compensation
...@@ -77,7 +74,7 @@ FOREACH(test ${tests}) ...@@ -77,7 +74,7 @@ FOREACH(test ${tests})
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} sot-core) PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} sot-core)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph) PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph-python) PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph-python)
IF(${test}_plugins_dependencies) IF(${test}_plugins_dependencies)
ADD_DEPENDENCIES(${EXECUTABLE_NAME} "${${test}_plugins_dependencies}") ADD_DEPENDENCIES(${EXECUTABLE_NAME} "${${test}_plugins_dependencies}")
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} "${${test}_plugins_dependencies}") TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} "${${test}_plugins_dependencies}")
...@@ -89,7 +86,7 @@ FOREACH(test ${tests}) ...@@ -89,7 +86,7 @@ FOREACH(test ${tests})
IF (UNIX) IF (UNIX)
SET(EXTRA_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH}) 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}") ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}:${CMAKE_BINARY_DIR}/src:${BOOST_ROOT}/lib:${EXTRA_LD_LIBRARY_PATH}")
ENDIF(UNIX) ENDIF(UNIX)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment