Commit 924d76f0 authored by Francois Bleibel's avatar Francois Bleibel
Browse files

Corrected missing linked libraries.

parent 4d4ecb23
......@@ -182,29 +182,6 @@ ELSE(PACKAGE_REQUIREMENTS STREQUAL "")
SET(PACKAGE_REQUIREMENTS "${PACKAGE_REQUIREMENTS}, ${MATRIXABSTRACTLAYER_REQUIRED}")
ENDIF(PACKAGE_REQUIREMENTS STREQUAL "")
#
# Dependency to package dynamic-graph
#
SET(DYNAMIC_GRAPH_FOUND 0)
SET(DYNAMIC_GRAPH_REQUIRED "dynamic-graph >= 1.0")
PKG_CHECK_MODULES(DYNAMIC_GRAPH REQUIRED ${DYNAMIC_GRAPH_REQUIRED})
EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir dynamic-graph
OUTPUT_VARIABLE DYNAMIC_GRAPH_DOCDIR)
MESSAGE(STATUS "pkg-config: ${PKG_CONFIG_EXECUTABLE}")
MESSAGE(STATUS "DYNAMIC_GRAPH_DOCDIR=${DYNAMIC_GRAPH_DOCDIR}")
SET(DYNAMIC_GRAPH_FOUND 1)
IF(NOT ${DYNAMIC_GRAPH_FOUND})
MESSAGE(FATAL_ERROR "Check that package dynamic-graph is installed in a directory pointed out by PKG_CONFIG_PATH.")
ENDIF(NOT ${DYNAMIC_GRAPH_FOUND})
IF(PACKAGE_REQUIREMENTS STREQUAL "")
SET(PACKAGE_REQUIREMENTS ${DYNAMIC_GRAPH_REQUIRED})
ELSE(PACKAGE_REQUIREMENTS STREQUAL "")
SET(PACKAGE_REQUIREMENTS "${PACKAGE_REQUIREMENTS}, ${DYNAMIC_GRAPH_REQUIRED}")
ENDIF(PACKAGE_REQUIREMENTS STREQUAL "")
#
# pkg-config file
#
......
......@@ -52,6 +52,7 @@ ENDIF(${DYNAMICSJRLJAPAN_FOUND})
IF(${_hrp210optimized_FOUND})
LIST(APPEND libs dynamic-hrp2_10)
SET (dynamic-hrp2_10_additional_libs ${_hrp210optimized_LIBRARIES})
SET (dynamic-hrp2_10_plugins_dependencies dynamic)
SET(dynamic-hrp2_10_plugins_compile_flags
${_dynamicsJRLJapan_CFLAGS} ${_hrp210optimized_CFLAGS})
......@@ -59,7 +60,8 @@ IF(${_hrp210optimized_FOUND})
${_dynamicsJRLJapan_LDFLAGS} ${_hrp210optimized_LDFLAGS})
LIST(APPEND libs dynamic-hrp2_10_old)
SET (dynamic-hrp2_10_plugins_dependencies dynamic)
SET (dynamic-hrp2_10_old_additional_libs ${_hrp210optimized_LIBRARIES})
SET (dynamic-hrp2_10_old_plugins_dependencies dynamic)
SET(dynamic-hrp2_10_old_plugins_compile_flags
${_dynamicsJRLJapan_CFLAGS} ${_hrp210optimized_CFLAGS})
SET(dynamic-hrp2_10_old_plugins_link_flags
......@@ -87,11 +89,13 @@ FOREACH(lib ${libs})
TARGET_LINK_LIBRARIES(${lib} ${MATRIXABSTRACTLAYER_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${HRP2DYNAMICS_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} ${DYNAMICSJRLJAPAN_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib} "${${lib}_additional_libs}")
ENDIF(UNIX)
IF(WIN32)
SET(${lib}_plugins_link_flags "${${PROJECT_NAME}_src_LDFLAGS} ${${lib}_plugins_link_flags}")
ENDIF(WIN32)
SET_TARGET_PROPERTIES(${lib}
PROPERTIES
COMPILE_FLAGS "${${lib}_plugins_compile_flags}"
......
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