Detect dynamic-graph plugindir properly

CMakeLists.txt

@@ -34,6 +34,8 @@ SET(${PROJECT_NAME}_HEADERS
 
 )
 
+SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
+
 SETUP_PROJECT()
 
 # Trigger dependency to dynamic-graph.

src/CMakeLists.txt

@@ -100,32 +100,26 @@ SET (PYTHON_SOURCES
     matlab.py
     script_shortcuts.py
     tools.py
-)	
+)
 
 FOREACH (SOURCE ${PYTHON_SOURCES})
   PYTHON_INSTALL_ON_SITE(dynamic_graph ${SOURCE} )
 ENDFOREACH (SOURCE)
 
-
-
 # --- ADD the wrap on the dg modules
-EXEC_PROGRAM("${PKG_CONFIG_EXECUTABLE}"
-             ARGS "--variable=plugindir" "dynamic-graph"
-             OUTPUT_VARIABLE "DYNAMIC_GRAPH_PLUGIN_DIR")
-
 # Tracer plugin
 IF(WIN32)
-SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer${CMAKE_STATIC_LIBRARY_SUFFIX})
+SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE(WIN32)
-SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer${CMAKE_SHARED_LIBRARY_SUFFIX})
+SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer${CMAKE_SHARED_LIBRARY_SUFFIX})
 ENDIF(WIN32)
 DYNAMIC_GRAPH_PYTHON_MODULE("tracer" ${TRACER_PLUGIN} tracer-wrap)
 
 # TracerRealTime plugin
 IF(WIN32)
-SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer-real-time${CMAKE_STATIC_LIBRARY_SUFFIX})
+SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer-real-time${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE(WIN32)
-SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer-real-time${CMAKE_SHARED_LIBRARY_SUFFIX})
+SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer-real-time${CMAKE_SHARED_LIBRARY_SUFFIX})
 ENDIF(WIN32)
 DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" ${TRACERREALTIME_PLUGIN} tracer_real_time-wrap)