Commit 3c1b4beb authored by Francois Bleibel's avatar Francois Bleibel
Browse files

Corrected library name in CMakeLists

parent e3facc81
...@@ -62,6 +62,7 @@ PKG_CHECK_MODULES(_hrp2Dynamics ${_hrp2Dynamics_REQUIRED}) ...@@ -62,6 +62,7 @@ PKG_CHECK_MODULES(_hrp2Dynamics ${_hrp2Dynamics_REQUIRED})
IF(${_hrp2Dynamics_FOUND}) IF(${_hrp2Dynamics_FOUND})
LIST(APPEND PACKAGE_REQUIREMENTS ${_hrp2Dynamics_REQUIRED}) LIST(APPEND PACKAGE_REQUIREMENTS ${_hrp2Dynamics_REQUIRED})
# MESSAGE(FATAL_ERROR "Check that package hrp2Dynamics is installed in a directory pointed out by PKG_CONFIG_PATH.") # MESSAGE(FATAL_ERROR "Check that package hrp2Dynamics is installed in a directory pointed out by PKG_CONFIG_PATH.")
MESSAGE("h2D libs are '${_hrp2Dynamics_LIBRARIES}'")
ENDIF(${_hrp2Dynamics_FOUND}) ENDIF(${_hrp2Dynamics_FOUND})
# --- HRP2-10-Optimized --------------------------------------- # --- HRP2-10-Optimized ---------------------------------------
......
...@@ -109,7 +109,7 @@ FOREACH(lib ${libs}) ...@@ -109,7 +109,7 @@ FOREACH(lib ${libs})
TARGET_LINK_LIBRARIES(${lib} ${DYNAMIC_GRAPH_LIBRARIES}) TARGET_LINK_LIBRARIES(${lib} ${DYNAMIC_GRAPH_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${SOT_CORE_LIBRARIES}) TARGET_LINK_LIBRARIES(${lib} ${SOT_CORE_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${MATRIXABSTRACTLAYER_LIBRARIES}) TARGET_LINK_LIBRARIES(${lib} ${MATRIXABSTRACTLAYER_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${HRP2DYNAMICS_LIBRARIES}) TARGET_LINK_LIBRARIES(${lib} ${_HRP2DYNAMICS_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${DYNAMICSJRLJAPAN_LIBRARIES}) TARGET_LINK_LIBRARIES(${lib} ${DYNAMICSJRLJAPAN_LIBRARIES})
ENDIF(UNIX) ENDIF(UNIX)
......
...@@ -18,6 +18,7 @@ ADD_EXECUTABLE(${EXECUTABLE_NAME} ...@@ -18,6 +18,7 @@ ADD_EXECUTABLE(${EXECUTABLE_NAME}
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/src) LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/src)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
zmpreffromcom zmpreffromcom
force-compensation force-compensation
...@@ -28,17 +29,20 @@ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ...@@ -28,17 +29,20 @@ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
angle-estimator angle-estimator
waist-attitude-from-sensor waist-attitude-from-sensor
) )
IF(${DYNAMICSJRLJAPAN_FOUND} AND ${_hrp2Dynamics_FOUND})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dynamic dynamic-hrp2)
ENDIF(${DYNAMICSJRLJAPAN_FOUND} AND ${_hrp2Dynamics_FOUND})
IF (UNIX) IF (UNIX)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${DYNAMIC_GRAPH_LIBRARIES}) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${DYNAMIC_GRAPH_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${SOT_CORE_LIBRARIES}) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${SOT_CORE_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${MATRIXABSTRACTLAYER_LIBRARIES}) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${MATRIXABSTRACTLAYER_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${HRP2DYNAMICS_LIBRARIES}) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${_hrp2Dynamics_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${DYNAMICSJRLJAPAN_LIBRARIES}) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${DYNAMICSJRLJAPAN_LIBRARIES})
IF(${DYNAMICSJRLJAPAN_FOUND})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dynamic)
IF(${_hrp2Dynamics_FOUND})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dynamic-hrp2)
ENDIF(${_hrp2Dynamics_FOUND})
ENDIF(${DYNAMICSJRLJAPAN_FOUND})
ENDIF(UNIX) ENDIF(UNIX)
IF(WIN32) IF(WIN32)
......
Supports Markdown
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