From 23f77706f95509c94193a4302f1f7537d0c30e12 Mon Sep 17 00:00:00 2001
From: Francois Keith <francois.keith@gmail.com>
Date: Fri, 15 Apr 2011 15:13:12 +0200
Subject: [PATCH] Correct the Python_module handling
- correct the mkdir command to make it cross-platforms
- remove the '/' in the module name (forbidden in win32 systems)
---
src/CMakeLists.txt | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed8c750..08e53e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,15 +111,13 @@ EXEC_PROGRAM("${PKG_CONFIG_EXECUTABLE}"
OUTPUT_VARIABLE "DYNAMIC_GRAPH_PLUGIN_DIR")
# Tracer plugin
-ADD_DEPENDENCIES(${LIBRARY_NAME} MKDIR_tracer)
-ADD_CUSTOM_TARGET(MKDIR_tracer mkdir -p ../lib/dynamic_graph/tracer)
-SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer.so)
-DYNAMIC_GRAPH_PYTHON_MODULE("tracer" ${TRACER_PLUGIN} tracer/wrap)
+file(MAKE_DIRECTORY ../lib/dynamic_graph/tracer)
+SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer${CMAKE_STATIC_LIBRARY_SUFFIX})
+DYNAMIC_GRAPH_PYTHON_MODULE("tracer" ${TRACER_PLUGIN} tracer-wrap)
# TracerRealTime plugin
-ADD_DEPENDENCIES(${LIBRARY_NAME} MKDIR_TracerRealTime)
-ADD_CUSTOM_TARGET(MKDIR_TracerRealTime mkdir -p ../lib/dynamic_graph/tracer_real_time)
-SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer-real-time.so)
-DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" ${TRACERREALTIME_PLUGIN} tracer_real_time/wrap)
+file(MAKE_DIRECTORY ../lib/dynamic_graph/tracer_real_time)
+SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGIN_DIR}/tracer-real-time${CMAKE_STATIC_LIBRARY_SUFFIX})
+DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" ${TRACERREALTIME_PLUGIN} tracer_real_time-wrap)
--
GitLab