[cmake] Fix cmakes bugs reported by A. Mallet in robotpkg.

stack-of-tasks · Jun 16, 2016 · c02308e · c02308e
1 parent 8277fa7
commit c02308e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -233,10 +233,6 @@ FOREACH(plugin ${plugins})
     TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CMAKE_DL_LIBS})
   ENDIF(UNIX)
 
-  IF(UNIX AND NOT APPLE)
-    TARGET_LINK_LIBRARIES(${LIBRARY_NAME} dl pthread)
-  ENDIF(UNIX AND NOT APPLE)
-
   PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} jrl-mal)
   PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
 

diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
@@ -104,7 +104,7 @@ IF(UNIX)
   tools/test_abstract_interface.cpp
   )
   TARGET_LINK_LIBRARIES(test_abstract_interface
-    pluginabstract dl ${Boost_LIBRARIES})
+    pluginabstract ${CMAKE_DL_LIBS} ${Boost_LIBRARIES})
 
   LINK_DIRECTORIES(${SOT_PLUGIN_OUT_DIR} ${FULLPLUGINDIR})
 ENDIF(UNIX)