From 28930fa1ae00e119f780fb99cf7675d2113a8986 Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Thu, 1 Jul 2010 13:36:55 +0900
Subject: [PATCH] Put shell functions firmly into dynamicgraph. Removed plugin.
Corrected headers inclusion.
---
include/CMakeLists.txt | 2 +-
include/dynamic-graph/{shell-functions.h => functions.h} | 0
src/CMakeLists.txt | 1 -
src/plugins/shell-functions.cpp | 2 +-
src/shell/functions.cpp | 2 +-
unitTesting/CMakeLists.txt | 2 +-
6 files changed, 4 insertions(+), 5 deletions(-)
rename include/dynamic-graph/{shell-functions.h => functions.h} (100%)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index ed8676d..6a7b7fe 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -16,7 +16,7 @@ exception-factory.h
exception-signal.h
exception-traces.h
-shell-functions.h
+functions.h
shell-procedure.h
signal.h
diff --git a/include/dynamic-graph/shell-functions.h b/include/dynamic-graph/functions.h
similarity index 100%
rename from include/dynamic-graph/shell-functions.h
rename to include/dynamic-graph/functions.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9ad74a4..aaafded 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,6 @@ INSTALL(TARGETS ${LIBRARY_NAME}
### Plugins
####################################
SET(plugins_list
- plugins/shell-functions
plugins/shell-procedure
debug/contiifstream
traces/tracer
diff --git a/src/plugins/shell-functions.cpp b/src/plugins/shell-functions.cpp
index 5c3453b..0fe0943 100644
--- a/src/plugins/shell-functions.cpp
+++ b/src/plugins/shell-functions.cpp
@@ -17,7 +17,7 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamic-graph/shell-functions.h>
+#include <dynamic-graph/functions.h>
#include <dynamic-graph/plugin-loader.h>
#include <dynamic-graph/factory.h>
#include <dynamic-graph/debug.h>
diff --git a/src/shell/functions.cpp b/src/shell/functions.cpp
index c325e38..c6ae2f7 100644
--- a/src/shell/functions.cpp
+++ b/src/shell/functions.cpp
@@ -17,7 +17,7 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamic-graph/shell-functions.h>
+#include <dynamic-graph/functions.h>
#include <dynamic-graph/plugin-loader.h>
#include <dynamic-graph/factory.h>
#include <dynamic-graph/debug.h>
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 04b7398..bf1bd7d 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -21,7 +21,7 @@ FOREACH(test_name ${tests})
)
LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
-
+
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${PROJECT_NAME})
--
GitLab