Commit 69dc0d3e authored by Thomas Moulard's avatar Thomas Moulard
Browse files

Detect dynamic-graph plugindir properly

parent 5bda9ef2
...@@ -34,6 +34,8 @@ SET(${PROJECT_NAME}_HEADERS ...@@ -34,6 +34,8 @@ SET(${PROJECT_NAME}_HEADERS
) )
SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
SETUP_PROJECT() SETUP_PROJECT()
# Trigger dependency to dynamic-graph. # Trigger dependency to dynamic-graph.
......
...@@ -100,32 +100,26 @@ SET (PYTHON_SOURCES ...@@ -100,32 +100,26 @@ SET (PYTHON_SOURCES
matlab.py matlab.py
script_shortcuts.py script_shortcuts.py
tools.py tools.py
) )
FOREACH (SOURCE ${PYTHON_SOURCES}) FOREACH (SOURCE ${PYTHON_SOURCES})
PYTHON_INSTALL_ON_SITE(dynamic_graph ${SOURCE} ) PYTHON_INSTALL_ON_SITE(dynamic_graph ${SOURCE} )
ENDFOREACH (SOURCE) ENDFOREACH (SOURCE)
# --- ADD the wrap on the dg modules # --- 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 # Tracer plugin
IF(WIN32) 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) 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) ENDIF(WIN32)
DYNAMIC_GRAPH_PYTHON_MODULE("tracer" ${TRACER_PLUGIN} tracer-wrap) DYNAMIC_GRAPH_PYTHON_MODULE("tracer" ${TRACER_PLUGIN} tracer-wrap)
# TracerRealTime plugin # TracerRealTime plugin
IF(WIN32) 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) 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) ENDIF(WIN32)
DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" ${TRACERREALTIME_PLUGIN} tracer_real_time-wrap) DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" ${TRACERREALTIME_PLUGIN} tracer_real_time-wrap)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment