Commit b4242ac6 authored by Francois Keith's avatar Francois Keith
Browse files

Why _hrp2Dynamics? Prefer HRP2DYNAMICS

The notation why upper case and without '_' correct all of this.
Plus, it follows the 'convention' of this project:
- libraries in Upper Case
- vrml files with _ and lower Case
parent 5e988caa
......@@ -56,21 +56,21 @@ ELSE(PACKAGE_REQUIREMENTS STREQUAL "")
ENDIF(PACKAGE_REQUIREMENTS STREQUAL "")
# --- HRP2DYNAMICS ---------------------------------------
SET(_hrp2Dynamics_FOUND 0)
SET(_hrp2Dynamics_REQUIRED "hrp2Dynamics >= 1.3.0")
#PKG_CHECK_MODULES(_hrp2Dynamics REQUIRED ${_hrp2Dynamics_REQUIRED})
PKG_CHECK_MODULES(_hrp2Dynamics ${_hrp2Dynamics_REQUIRED})
SET(HRP2DYNAMICS_FOUND 0)
SET(HRP2DYNAMICS_REQUIRED "hrp2Dynamics >= 1.3.0")
#PKG_CHECK_MODULES(HRP2DYNAMICS REQUIRED ${HRP2DYNAMICS_REQUIRED})
PKG_CHECK_MODULES(HRP2DYNAMICS ${HRP2DYNAMICS_REQUIRED})
IF(${_hrp2Dynamics_FOUND})
LIST(APPEND PACKAGE_REQUIREMENTS ${_hrp2Dynamics_REQUIRED})
IF(${HRP2DYNAMICS_FOUND})
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(STATUS "h2D libs are '${_hrp2Dynamics_LIBRARIES}'")
ENDIF(${_hrp2Dynamics_FOUND})
MESSAGE(STATUS "h2D libs are '${HRP2DYNAMICS_LIBRARIES}'")
ENDIF(${HRP2DYNAMICS_FOUND})
# --- HRP2-10-Optimized ---------------------------------------
SET(_hrp210optimized_FOUND 0)
SET(_hrp210optimized_REQUIRED "hrp2-10-optimized >= 1.0")
#PKG_CHECK_MODULES(_hrp2Dynamics REQUIRED ${_hrp2Dynamics_REQUIRED})
#PKG_CHECK_MODULES(HRP2DYNAMICS REQUIRED ${HRP2DYNAMICS_REQUIRED})
PKG_CHECK_MODULES(_hrp210optimized ${_hrp210optimized_REQUIRED})
IF(${_hrp210optimized_FOUND})
......
......@@ -85,10 +85,10 @@ SET(libs
IF(${DYNAMICSJRLJAPAN_FOUND})
LIST(APPEND libs dynamic)
IF(${_hrp2Dynamics_FOUND})
IF(${HRP2DYNAMICS_FOUND})
LIST(APPEND libs dynamic-hrp2)
SET (dynamic-hrp2_plugins_dependencies dynamic)
ENDIF(${_hrp2Dynamics_FOUND})
ENDIF(${HRP2DYNAMICS_FOUND})
ENDIF(${DYNAMICSJRLJAPAN_FOUND})
SET(integrator-force-rk4_plugins_dependencies integrator-force)
......@@ -109,7 +109,7 @@ FOREACH(lib ${libs})
TARGET_LINK_LIBRARIES(${lib} ${DYNAMIC_GRAPH_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${SOT_CORE_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${MATRIXABSTRACTLAYER_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} "hrp2Dynamics")
TARGET_LINK_LIBRARIES(${lib} ${HRP2DYNAMICS_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${DYNAMICSJRLJAPAN_LIBRARIES})
ENDIF(UNIX)
......
......@@ -50,7 +50,7 @@ FOREACH(test ${tests})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${DYNAMIC_GRAPH_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${SOT_CORE_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${MATRIXABSTRACTLAYER_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} "hrp2Dynamics")
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${HRP2DYNAMICS_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} "${DYNAMICSJRLJAPAN_LIBRARIES}")
ENDIF(UNIX)
......
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