From 760a05459feaa26d2183d6b7820cda20c32fb4b8 Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Mon, 27 Sep 2010 11:07:31 +0900
Subject: [PATCH] Corrected linking multiple libraries with dynamicsJRLJapan.
---
unitTesting/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index caa5eb5..c476a72 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -17,12 +17,12 @@ LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/src)
# Add MatrixAbstractLayer compilation flags and link to library libMatrixAbstractLayer.so
ADD_DEFINITIONS(${MATRIXABSTRACTLAYER_CFLAGS})
-IF(NOT UNIX)
+IF(WIN32)
foreach(dlink ${MATRIXABSTRACTLAYER_LDFLAGS} ${DYNAMICSJRLJAPAN_LDFLAGS}
${HRP2DYNAMICS_LDFLAGS} ${DYNAMIC_GRAPH_LDFLAGS} ${SOT_CORE_LDFLAGS})
SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS} ${dlink}")
endforeach(dlink)
-ENDIF(NOT UNIX)
+ENDIF(WIN32)
SET(tests
dummy
@@ -51,7 +51,7 @@ FOREACH(test ${tests})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${SOT_CORE_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${MATRIXABSTRACTLAYER_LIBRARIES})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${HRP2DYNAMICS_LIBRARIES})
- TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} "${DYNAMICSJRLJAPAN_LIBRARIES}")
+ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${DYNAMICSJRLJAPAN_LIBRARIES})
ENDIF(UNIX)
IF(${DYNAMICSJRLJAPAN_FOUND})
--
GitLab