Merge branch 'master' into devel

proyan · proyan · commit 4912c6e4c042 · 2017-06-23T15:15:46.000+02:00
Conflicts:
	src/CMakeLists.txt
diff --git a/cmake b/cmake
@@ -1 +1 @@
-Subproject commit 14fd3668f967ea742f247054896f253d62438950
+Subproject commit 9965dbcd2a37edbc98707573c05512d838e64c10
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -214,10 +214,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} dynamic-graph)
 
   # build python submodule
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
@@ -103,7 +103,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
`@@ -103,7 +103,7 @@ IF(UNIX)`
`103`	`103`	`tools/test_abstract_interface.cpp`
`104`	`104`	`)`
`105`	`105`	`TARGET_LINK_LIBRARIES(test_abstract_interface`
`106`		`- pluginabstract dl ${Boost_LIBRARIES})`
	`106`	`+ pluginabstract ${CMAKE_DL_LIBS} ${Boost_LIBRARIES})`
`107`	`107`
`108`	`108`	`LINK_DIRECTORIES(${SOT_PLUGIN_OUT_DIR} ${FULLPLUGINDIR})`
`109`	`109`	`ENDIF(UNIX)`