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

olivier-stasse · olivier-stasse · commit c02308e5b72b · 2016-06-16T16:26:23.000+02:00
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)

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ IF(UNIX)`
`104`	`104`	`tools/test_abstract_interface.cpp`
`105`	`105`	`)`
`106`	`106`	`TARGET_LINK_LIBRARIES(test_abstract_interface`
`107`		`- pluginabstract dl ${Boost_LIBRARIES})`
	`107`	`+ pluginabstract ${CMAKE_DL_LIBS} ${Boost_LIBRARIES})`
`108`	`108`
`109`	`109`	`LINK_DIRECTORIES(${SOT_PLUGIN_OUT_DIR} ${FULLPLUGINDIR})`
`110`	`110`	`ENDIF(UNIX)`