From 6d0b4a00bbe881d135095bbc7c2915c74d0b1734 Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Fri, 11 Jun 2010 11:08:51 +0900
Subject: [PATCH] Changed CMakeLists to cope for the new headers location.
Renamed dynamic-graph-API.h to dynamic-graph-api.h in every header file.
---
include/CMakeLists.txt | 86 +++++++++++--------
.../dynamic-graph}/contiifstream.h | 0
{src/debug => include/dynamic-graph}/debug.h | 2 +-
.../{ => dynamic-graph}/dynamic-graph-api.h | 0
.../dgraph => include/dynamic-graph}/entity.h | 2 +-
.../dynamic-graph}/exception-abstract.h | 2 +-
.../dynamic-graph}/exception-factory.h | 2 +-
.../dynamic-graph}/exception-signal.h | 2 +-
.../dynamic-graph}/factory.h | 2 +-
.../dynamic-graph}/interpreter.h | 2 +-
.../dynamic-graph}/plugin-loader.h | 2 +-
{src/dgraph => include/dynamic-graph}/pool.h | 2 +-
.../dynamic-graph}/shell-functions.h | 0
.../dynamic-graph}/shell-procedure.h | 0
.../dynamic-graph}/signal-array.h | 2 +-
.../dynamic-graph}/signal-base.h | 0
.../dynamic-graph}/signal-ptr.h | 0
.../dynamic-graph}/signal-ptr.t.cpp | 0
.../dynamic-graph}/signal-time-dependant.h | 0
.../signal => include/dynamic-graph}/signal.h | 0
.../dynamic-graph}/signal.t.cpp | 0
.../dynamic-graph}/time-dependency.h | 0
.../dynamic-graph}/time-dependency.t.cpp | 0
src/CMakeLists.txt | 4 +-
unitTesting/CMakeLists.txt | 2 +-
25 files changed, 62 insertions(+), 50 deletions(-)
rename {src/debug => include/dynamic-graph}/contiifstream.h (100%)
rename {src/debug => include/dynamic-graph}/debug.h (99%)
rename include/{ => dynamic-graph}/dynamic-graph-api.h (100%)
rename {src/dgraph => include/dynamic-graph}/entity.h (98%)
rename {src/exception => include/dynamic-graph}/exception-abstract.h (98%)
rename {src/exception => include/dynamic-graph}/exception-factory.h (97%)
rename {src/exception => include/dynamic-graph}/exception-signal.h (97%)
rename {src/dgraph => include/dynamic-graph}/factory.h (98%)
rename {src/dgraph => include/dynamic-graph}/interpreter.h (99%)
rename {src/dgraph => include/dynamic-graph}/plugin-loader.h (98%)
rename {src/dgraph => include/dynamic-graph}/pool.h (98%)
rename {src/dgraph => include/dynamic-graph}/shell-functions.h (100%)
rename {src/dgraph => include/dynamic-graph}/shell-procedure.h (100%)
rename {src/signal => include/dynamic-graph}/signal-array.h (98%)
rename {src/signal => include/dynamic-graph}/signal-base.h (100%)
rename {src/signal => include/dynamic-graph}/signal-ptr.h (100%)
rename {src/signal => include/dynamic-graph}/signal-ptr.t.cpp (100%)
rename {src/signal => include/dynamic-graph}/signal-time-dependant.h (100%)
rename {src/signal => include/dynamic-graph}/signal.h (100%)
rename {src/signal => include/dynamic-graph}/signal.t.cpp (100%)
rename {src/signal => include/dynamic-graph}/time-dependency.h (100%)
rename {src/signal => include/dynamic-graph}/time-dependency.t.cpp (100%)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 0e940a5..8de004e 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,38 +1,50 @@
-### Get the headers paths
-SET(include_list "${CMAKE_CURRENT_SOURCE_DIR}/dynamic-graph-API.h")
-FILE(GLOB_RECURSE headers_list
- ${PROJECT_SOURCE_DIR}/src/*.h
-)
-FILE(GLOB_RECURSE templates_list
- ${PROJECT_SOURCE_DIR}/src/*.t.cpp
+SET(${PROJECT_NAME}_HEADERS
+contiifstream.h
+debug.h
+
+dynamic-graph-api.h
+
+entity.h
+factory.h
+interpreter.h
+plugin-loader.h
+pool.h
+
+exception-abstract.h
+exception-factory.h
+exception-signal.h
+
+
+shell-functions.h
+shell-procedure.h
+
+signal.h
+signal-array.h
+signal-base.h
+signal-ptr.h
+signal-time-dependant.h
+signal-ptr.t.cpp
+signal.t.cpp
+time-dependency.h
+time-dependency.t.cpp
)
-LIST(APPEND include_list ${headers_list})
-LIST(APPEND include_list ${templates_list})
-
-### Copy headers to include directories
-SET(HEADER_IN_INCLUDE_DIR "")
-FOREACH(header ${include_list})
- GET_FILENAME_COMPONENT(headerName ${header} NAME)
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName}
- COMMAND ${CMAKE_COMMAND} -E copy ${header}
- ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName}
- )
-
- INSTALL(FILES
- ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
-
- SET(HEADER_IN_INCLUDE_DIR ${HEADER_IN_INCLUDE_DIR}
- ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName})
-ENDFOREACH(header)
-
-### Create a top level rule to copy all the headers from src to include/dynamic-graph
-ADD_CUSTOM_TARGET(headers ALL
- DEPENDS ${HEADER_IN_INCLUDE_DIR})
-
-### Dependency of the main library on the headers
-ADD_DEPENDENCIES(${PROJECT_NAME}
- headers)
+
+# Recreate correct path for the headers
+#--------------------------------------
+
+SET(fullpath_${PROJECT_NAME}_HEADERS)
+FOREACH(lHeader ${${PROJECT_NAME}_HEADERS})
+ SET(fullpath_${PROJECT_NAME}_HEADERS
+ ${fullpath_${PROJECT_NAME}_HEADERS}
+ ./${PROJECT_NAME}/${lHeader}
+ )
+
+ENDFOREACH(lHeader)
+
+#----------------------------------------------------
+# Install procedure for the header files
+#----------------------------------------------------
+INSTALL(FILES ${fullpath_${PROJECT_NAME}_HEADERS}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}
+ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
+)
\ No newline at end of file
diff --git a/src/debug/contiifstream.h b/include/dynamic-graph/contiifstream.h
similarity index 100%
rename from src/debug/contiifstream.h
rename to include/dynamic-graph/contiifstream.h
diff --git a/src/debug/debug.h b/include/dynamic-graph/debug.h
similarity index 99%
rename from src/debug/debug.h
rename to include/dynamic-graph/debug.h
index 664f5cc..3570495 100644
--- a/src/debug/debug.h
+++ b/include/dynamic-graph/debug.h
@@ -42,7 +42,7 @@
#include <fstream>
#include <sstream>
#include <stdarg.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
/* -------------------------------------------------------------------------- */
diff --git a/include/dynamic-graph-api.h b/include/dynamic-graph/dynamic-graph-api.h
similarity index 100%
rename from include/dynamic-graph-api.h
rename to include/dynamic-graph/dynamic-graph-api.h
diff --git a/src/dgraph/entity.h b/include/dynamic-graph/entity.h
similarity index 98%
rename from src/dgraph/entity.h
rename to include/dynamic-graph/entity.h
index 9466225..b126649 100644
--- a/src/dgraph/entity.h
+++ b/include/dynamic-graph/entity.h
@@ -30,7 +30,7 @@
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/signal-array.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
/* --- STD --- */
#include <string>
diff --git a/src/exception/exception-abstract.h b/include/dynamic-graph/exception-abstract.h
similarity index 98%
rename from src/exception/exception-abstract.h
rename to include/dynamic-graph/exception-abstract.h
index d3e9611..2b2acfa 100644
--- a/src/exception/exception-abstract.h
+++ b/include/dynamic-graph/exception-abstract.h
@@ -29,7 +29,7 @@
/* Classes standards. */
#include <iostream> /* Classe ostream. */
#include <string> /* Classe string. */
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
// Uncomment this macros to have lines parameter on the throw display
diff --git a/src/exception/exception-factory.h b/include/dynamic-graph/exception-factory.h
similarity index 97%
rename from src/exception/exception-factory.h
rename to include/dynamic-graph/exception-factory.h
index 71cfbfc..ea5f60e 100644
--- a/src/exception/exception-factory.h
+++ b/include/dynamic-graph/exception-factory.h
@@ -27,7 +27,7 @@
#include <dynamic-graph/exception-abstract.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
/* --------------------------------------------------------------------- */
/* --- CLASS ----------------------------------------------------------- */
diff --git a/src/exception/exception-signal.h b/include/dynamic-graph/exception-signal.h
similarity index 97%
rename from src/exception/exception-signal.h
rename to include/dynamic-graph/exception-signal.h
index 5fc6368..9834b31 100644
--- a/src/exception/exception-signal.h
+++ b/include/dynamic-graph/exception-signal.h
@@ -27,7 +27,7 @@
#include <dynamic-graph/exception-abstract.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
/* --------------------------------------------------------------------- */
/* --- CLASS ----------------------------------------------------------- */
diff --git a/src/dgraph/factory.h b/include/dynamic-graph/factory.h
similarity index 98%
rename from src/dgraph/factory.h
rename to include/dynamic-graph/factory.h
index 20b88e6..bb679d0 100644
--- a/src/dgraph/factory.h
+++ b/include/dynamic-graph/factory.h
@@ -32,7 +32,7 @@
/* --- SOT --- */
#include <dynamic-graph/exception-factory.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
namespace dynamicgraph {
diff --git a/src/dgraph/interpreter.h b/include/dynamic-graph/interpreter.h
similarity index 99%
rename from src/dgraph/interpreter.h
rename to include/dynamic-graph/interpreter.h
index f305d99..e2aff77 100644
--- a/src/dgraph/interpreter.h
+++ b/include/dynamic-graph/interpreter.h
@@ -30,7 +30,7 @@
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/pool.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
/* --- STD --- */
#include <string>
diff --git a/src/dgraph/plugin-loader.h b/include/dynamic-graph/plugin-loader.h
similarity index 98%
rename from src/dgraph/plugin-loader.h
rename to include/dynamic-graph/plugin-loader.h
index da01ec2..8fbf859 100644
--- a/src/dgraph/plugin-loader.h
+++ b/include/dynamic-graph/plugin-loader.h
@@ -33,7 +33,7 @@
/* --- SOT --- */
#include <dynamic-graph/exception-factory.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
namespace dynamicgraph {
diff --git a/src/dgraph/pool.h b/include/dynamic-graph/pool.h
similarity index 98%
rename from src/dgraph/pool.h
rename to include/dynamic-graph/pool.h
index 50543be..d9d41d1 100644
--- a/src/dgraph/pool.h
+++ b/include/dynamic-graph/pool.h
@@ -32,7 +32,7 @@
/* --- SOT --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/signal-base.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
namespace dynamicgraph
{
diff --git a/src/dgraph/shell-functions.h b/include/dynamic-graph/shell-functions.h
similarity index 100%
rename from src/dgraph/shell-functions.h
rename to include/dynamic-graph/shell-functions.h
diff --git a/src/dgraph/shell-procedure.h b/include/dynamic-graph/shell-procedure.h
similarity index 100%
rename from src/dgraph/shell-procedure.h
rename to include/dynamic-graph/shell-procedure.h
diff --git a/src/signal/signal-array.h b/include/dynamic-graph/signal-array.h
similarity index 98%
rename from src/signal/signal-array.h
rename to include/dynamic-graph/signal-array.h
index dd34fa5..d429340 100644
--- a/src/signal/signal-array.h
+++ b/include/dynamic-graph/signal-array.h
@@ -24,7 +24,7 @@
#define __SIGNAL_ARRAY_HH
#include <dynamic-graph/signal-base.h>
-#include <dynamic-graph/dynamic-graph-API.h>
+#include <dynamic-graph/dynamic-graph-api.h>
namespace dynamicgraph {
diff --git a/src/signal/signal-base.h b/include/dynamic-graph/signal-base.h
similarity index 100%
rename from src/signal/signal-base.h
rename to include/dynamic-graph/signal-base.h
diff --git a/src/signal/signal-ptr.h b/include/dynamic-graph/signal-ptr.h
similarity index 100%
rename from src/signal/signal-ptr.h
rename to include/dynamic-graph/signal-ptr.h
diff --git a/src/signal/signal-ptr.t.cpp b/include/dynamic-graph/signal-ptr.t.cpp
similarity index 100%
rename from src/signal/signal-ptr.t.cpp
rename to include/dynamic-graph/signal-ptr.t.cpp
diff --git a/src/signal/signal-time-dependant.h b/include/dynamic-graph/signal-time-dependant.h
similarity index 100%
rename from src/signal/signal-time-dependant.h
rename to include/dynamic-graph/signal-time-dependant.h
diff --git a/src/signal/signal.h b/include/dynamic-graph/signal.h
similarity index 100%
rename from src/signal/signal.h
rename to include/dynamic-graph/signal.h
diff --git a/src/signal/signal.t.cpp b/include/dynamic-graph/signal.t.cpp
similarity index 100%
rename from src/signal/signal.t.cpp
rename to include/dynamic-graph/signal.t.cpp
diff --git a/src/signal/time-dependency.h b/include/dynamic-graph/time-dependency.h
similarity index 100%
rename from src/signal/time-dependency.h
rename to include/dynamic-graph/time-dependency.h
diff --git a/src/signal/time-dependency.t.cpp b/include/dynamic-graph/time-dependency.t.cpp
similarity index 100%
rename from src/signal/time-dependency.t.cpp
rename to include/dynamic-graph/time-dependency.t.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09f5d2a..3161df4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
SET(LIBRARY_NAME ${PROJECT_NAME})
INCLUDE_DIRECTORIES(
- ${${PROJECT_NAME}_BINARY_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
)
ADD_DEFINITIONS(-DDEBUG=2)
@@ -64,4 +64,4 @@ SET_TARGET_PROPERTIES(${plugin}
INSTALL(TARGETS ${plugin}
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugin)
-ENDFOREACH(plugin)
\ No newline at end of file
+ENDFOREACH(plugin_file)
\ No newline at end of file
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 116aebb..51df61e 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -11,7 +11,7 @@ ADD_EXECUTABLE(${EXECUTABLE_NAME}
test_shell.cpp)
INCLUDE_DIRECTORIES(
- ${${PROJECT_NAME}_BINARY_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
)
LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
--
GitLab