Commit 4f417977 authored by Francois Bleibel's avatar Francois Bleibel
Browse files

The package name is now dynamic-graph (this still needs to be changed in the...

The package name is now dynamic-graph (this still needs to be changed in the git repository). Updated source files to reflect that change. Clarified CMakeLists, explicited cpp source files for libraries.
parent a6b50921
......@@ -4,7 +4,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(PROJECT_NAME dynamicGraph)
SET(PROJECT_NAME dynamic-graph)
project(${PROJECT_NAME})
# --- PROJECT VERSION -----------------------
......@@ -16,6 +16,7 @@ SET(PROJECT_VERSION ${${PROJECT_NAME}_VERSION})
SET(CMAKE_VERBOSE_MAKEFILE true)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
# Get the OS
SET(OS ${CMAKE_SYSTEM_NAME})
......@@ -61,11 +62,6 @@ OPTION(BUILD_SHARED_LIBS "Build ${PROJECT_NAME} with shared libraries." ON)
OPTION(GENERATE_DOC "Generate html documentation" OFF)
OPTION(USE_BOOST "Compile with boost." ON)
OPTION(USE_DYNAMICS_JRL_JAPAN "Compile with dynamicsJRLJapan" ON)
# Release/Debug
#SET(CMAKE_BUILD_TYPE RELEASE)
#SET(CMAKE_BUILD_TYPE DEBUG)
#
# Look for dependencies
......@@ -106,6 +102,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dynamic-graph.pc
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(unitTesting)
#
# Documentation produced by doxygen
#
......
Write in this file the news related to package dynamicGraph.
Write in this file the news related to package dynamic-graph.
......@@ -4,7 +4,7 @@
\section intro_dynamicGraph Introduction
This code implements the factory design pattern, making creation of entities
available to packages depending on the dynamicGraph API.
available to packages depending on the dynamic-graph API.
Objects, which are derived from Entities, can be
declared within the code and compiled to shared libraries (.so/.dll files).
......@@ -42,7 +42,7 @@ corresponding headers in this module are:
\ingroup dgraph
@{
Classes that make up the core of the dynamicGraph library are listed here.
Classes that make up the core of the dynamic-graph library are listed here.
@}
\ingroup signals
@{
......
......@@ -162,7 +162,7 @@ TAGFILES = \
${_dynamicsJRLJapan_DOCDIR}/html/dynamicsJRLJapan.doxytag=${_dynamicsJRLJapan_DOCDIR}/html \
${_hrp2Dynamics_DOCDIR}/html/hrp2Dynamics.doxytag=${_hrp2Dynamics_DOCDIR}/html \
${_walkGenJrl_DOCDIR}/html/walkGenJrl.doxytag=${_walkGenJrl_DOCDIR}/html
GENERATE_TAGFILE = dynamicGraph.doxytag
GENERATE_TAGFILE = dynamic-graph.doxytag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
......
#
# Copyright
#
SET(${PROJECT_NAME}_HEADERS
dynamicGraph-API.h
### 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
)
LIST(APPEND include_list ${headers_list})
LIST(APPEND include_list ${templates_list})
# 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}
./${lHeader}
)
### 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)
ENDFOREACH(lHeader)
### 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})
#----------------------------------------------------
# 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
)
### Dependency of the main library on the headers
ADD_DEPENDENCIES(${PROJECT_NAME}
headers)
/*
* Copyright
*/
#ifndef DYNAMICGRAPH_API_H
#define DYNAMICGRAPH_API_H
#if defined (WIN32)
# ifdef DYNAMICGRAPH_EXPORT
# define DYNAMICGRAPH_EXPORT __declspec(dllexport)
# else
# define DYNAMICGRAPH_EXPORT __declspec(dllimport)
# endif
#else
# define DYNAMICGRAPH_EXPORT
#endif
#endif
#
# Copyright
#
####################################
### Main Library
####################################
SET(LIBRARY_NAME ${PROJECT_NAME})
# Create the library "dynamicGraph"
SET(libdg_src "")
SET(libdg_headers "../include/dynamicGraph-API.h")
SET(libdg_templates "")
SET(libdg_plugins "")
SET(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(LIBRARY_NAME dynamicGraph)
#ordre est important
INCLUDE_DIRECTORIES(
${${PROJECT_NAME}_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/include
${${PROJECT_NAME}_BINARY_DIR}/include
)
ADD_DEFINITIONS(-DDEBUG=2)
# provide path to library libMatrixAbstractLayer.so
LINK_DIRECTORIES(${_MatrixAbstractLayer_LIBRARY_DIRS})
# provide path to library libdynamicsJRLJapan.so
LINK_DIRECTORIES(${_dynamicsJRLJapan_LIBRARY_DIRS})
# provide path to library libhrp2Dynamics.so
LINK_DIRECTORIES(${_hrp2Dynamics_LIBRARY_DIRS})
# provide path to library libwalkGenJrl.so
LINK_DIRECTORIES(${_walkGenJrl_LIBRARY_DIRS})
#############################################"
MACRO(SOT_SRC_SUBDIR_PROCESS)
# Guess the .h names from .cpp names.
FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_src})
SET(newsrcfile "")
STRING(REGEX REPLACE "cpp$" "h" newsrcfile ${srcfile})
LIST(APPEND libdg_${SOT_MODULE_NAME}_headers ${newsrcfile})
ENDFOREACH(srcfile)
# Same for plugins.
FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_plugins_src})
SET(newsrcfile "")
STRING(REGEX REPLACE "cpp$" "h" newsrcfile ${srcfile})
LIST(APPEND libdg_${SOT_MODULE_NAME}_plugins_headers ${newsrcfile})
ENDFOREACH(srcfile)
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
debug/debug.cpp
# Guess the .h names from .t.cpp template names.
SET(tempext "t\\.cpp")
FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_templates})
SET(newsrcfile "")
STRING(REGEX REPLACE "${tempext}$" "h" newsrcfile ${srcfile})
LIST(APPEND libdg_${SOT_MODULE_NAME}_headers ${newsrcfile})
ENDFOREACH(srcfile)
# Same for plugins.
FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_plugins_templates})
LIST(APPEND libdg_${SOT_MODULE_NAME}_plugins_headers ${srcfile})
ENDFOREACH(srcfile)
dgraph/entity.cpp
dgraph/factory.cpp
dgraph/interpreter.cpp
dgraph/plugin-loader.cpp
dgraph/pool.cpp
# Down to the previous level.
LIST(APPEND libdg_src ${libdg_${SOT_MODULE_NAME}_src})
LIST(APPEND libdg_headers ${libdg_${SOT_MODULE_NAME}_headers})
LIST(APPEND libdg_templates ${libdg_${SOT_MODULE_NAME}_templates})
LIST(APPEND libdg_plugins_src ${libdg_${SOT_MODULE_NAME}_plugins_src})
LIST(APPEND libdg_plugins_headers ${libdg_${SOT_MODULE_NAME}_plugins_headers})
LIST(APPEND libdg_plugins_templates ${libdg_${SOT_MODULE_NAME}_plugins_templates})
ENDMACRO(SOT_SRC_SUBDIR_PROCESS)
INCLUDE(debug/SourcesLib.cmake)
INCLUDE(dgraph/SourcesLib.cmake)
INCLUDE(signal/SourcesLib.cmake)
INCLUDE(exception/SourcesLib.cmake)
# -------------------------------------------------------------
# --- HEADERS -------------------------------------------------
# -------------------------------------------------------------
# Create rule to copy all the headers form src to include/src
# For each header we create a rule
SET(HEADER_IN_INCLUDE_DIR "")
SET(ADDED_SRC_DEPEND_PROPERTIES "")
FOREACH (header ${libdg_headers} ${libdg_templates})
GET_FILENAME_COMPONENT(headerName ${header} NAME)
ADD_CUSTOM_COMMAND(
OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${header}
${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${header}
exception/exception-abstract.cpp
exception/exception-factory.cpp
exception/exception-signal.cpp
signal/signal-array.cpp
)
INSTALL(FILES
${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
SET(HEADER_IN_INCLUDE_DIR ${HEADER_IN_INCLUDE_DIR}
${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName})
ENDFOREACH(header)
# --- Create a top level rule to copy all the headers from src to include/dynamicGraph
ADD_CUSTOM_TARGET(header ALL
DEPENDS ${HEADER_IN_INCLUDE_DIR})
# --- Dependencies of the dgraph library on the headers.
ADD_LIBRARY(${LIBRARY_NAME}
${libdg_src} ${libdg_headers}
)
# Add MatrixAbstractLayer compilation flags and link to library libMatrixAbstractLayer.so
ADD_DEFINITIONS(${_MatrixAbstractLayer_CFLAGS})
IF(UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_MatrixAbstractLayer_LIBRARIES})
ENDIF(UNIX)
IF(WIN32)
foreach(dlink ${_MatrixAbstractLayer_LDFLAGS})
SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS} ${dlink}")
endforeach(dlink)
ENDIF(WIN32)
# Add dynamicsJRLJapan compilation flags and link to library libdynamicsJRLJapan.so
ADD_DEFINITIONS(${_dynamicsJRLJapan_CFLAGS})
IF(UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_dynamicsJRLJapan_LIBRARIES})
ENDIF(UNIX)
IF(WIN32)
foreach(dlink ${_dynamicsJRLJapan_LDFLAGS})
SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS} ${dlink}")
endforeach(dlink)
ENDIF(WIN32)
# Add hrp2Dynamics compilation flags and link to library libhrp2Dynamics.so
ADD_DEFINITIONS(${_hrp2Dynamics_CFLAGS})
IF(UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_hrp2Dynamics_LIBRARIES})
ENDIF(UNIX)
IF(WIN32)
foreach(dlink ${_hrp2Dynamics_LDFLAGS})
SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS} ${dlink}")
endforeach(dlink)
ENDIF(WIN32)
# Add walkGenJrl compilation flags and link to library libwalkGenJrl.so
ADD_DEFINITIONS(${_walkGenJrl_CFLAGS})
IF(UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_walkGenJrl_LIBRARIES})
ENDIF(UNIX)
IF(WIN32)
foreach(dlink ${_walkGenJrl_LDFLAGS})
SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS} ${dlink}")
endforeach(dlink)
ENDIF(WIN32)
# -------------------------------------------------------------
# --- LIBS ----------------------------------------------------
# -------------------------------------------------------------
SET_TARGET_PROPERTIES(${LIBRARY_NAME}
PROPERTIES
SOVERSION ${PROJECT_VERSION}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
SET_TARGET_PROPERTIES(${LIBRARY_NAME}
SET_TARGET_PROPERTIES(${LIBRARY_NAME}
PROPERTIES
COMPILE_FLAGS "${${PROJECT_NAME}_src_CXXFLAGS}"
LINK_FLAGS "${${PROJECT_NAME}_src_LDFLAGS}"
)
# --- Force the creation of the headers before compiling the lib.
ADD_DEPENDENCIES(${LIBRARY_NAME} header)
# Install the main lib.
INSTALL(TARGETS ${LIBRARY_NAME}
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
####################################
### Plugins
####################################
SET(plugins_list
dgraph/shell-functions
dgraph/shell-procedure
debug/contiifstream
)
FOREACH(plugin_file ${plugins_list})
GET_FILENAME_COMPONENT(plugin ${plugin_file} NAME)
ADD_LIBRARY(${plugin}
SHARED
"${plugin_file}.cpp")
TARGET_LINK_LIBRARIES(${plugin}
${PROJECT_NAME})
SET_TARGET_PROPERTIES(${plugin}
PROPERTIES
COMPILE_FLAGS "${${PROJECT_NAME}_CXXFLAGS}"
PREFIX ""
LIBRARY_OUTPUT_DIRECTORY "${${PROJECT_NAME}_BINARY_DIR}/lib/plugin")
# -------------------------------------------------------------
# --- PLUGINS -------------------------------------------------
# -------------------------------------------------------------
# -------------------------------------------------------------------
# --- UTILS ---------------------------------------------------------
# -------------------------------------------------------------------
MACRO(LIST2STRING _VAR_ARG _LIST_ARG)
SET(${_VAR_ARG})
SET(_FIRST_STEP 1)
FOREACH(_ITEM ${ARGV})
IF(_FIRST_STEP)
SET(_FIRST_STEP 0)
ELSE(_FIRST_STEP)
SET (${_VAR_ARG} "${${_VAR_ARG}} ${_ITEM}")
ENDIF(_FIRST_STEP)
ENDFOREACH(_ITEM)
ENDMACRO(LIST2STRING)
# Create rule to compile all the plugins form src to include/src.
# For each plugin we create a rule.
SET(PLUGINS_IN_LIBPATH "")
SET(srcextension "\\.cpp")
SET(srcheader "\\.h")
SET(srctemplate "t\\.cpp")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/lib/plugin")
# --- PLUGIN HEADERs -----------------------------------------
# Add the command that will copy the header of each plugin
# in the include repository.
FOREACH (plugin ${libdg_plugins_headers})
# Create the name of the library out of the name of the plugin.
GET_FILENAME_COMPONENT(pluginHeader ${plugin} NAME)
STRING(REGEX REPLACE "${srcheader}$" "" newsofile ${pluginHeader})
# Add a command to copy the header.
ADD_CUSTOM_COMMAND(
OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/${plugin}
${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
# Create a top level rule to copy all the headers from src to include/dg
ADD_CUSTOM_TARGET(header_${newsofile} ALL
DEPENDS ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader})
ENDFOREACH(plugin)
# --- PLUGIN TEMPLATEs -----------------------------------------
# Add the command that will copy the header of each plugin
# in the include repository.
FOREACH (plugin ${libdg_plugins_templates})
# Create the name of the library out of the name of the plugin.
GET_FILENAME_COMPONENT(pluginTemplate ${plugin} NAME)
STRING(REGEX REPLACE "${srctemplate}$" "" newsofile ${pluginTemplate})
STRING(REGEX REPLACE ".${srctemplate}$" "" newsofile2 ${pluginTemplate})
SET(${newsofile2}Template ${plugin})
# Add a command to copy the header.
ADD_CUSTOM_COMMAND(
OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/${plugin}
${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
# Create a top level rule to copy all the headers from src to include/dg
ADD_CUSTOM_TARGET(header_${newsofile} ALL
DEPENDS ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate})
ENDFOREACH(plugin)
# --- PLUGIN LINKS -------------------------------------------
# Specific LD Flags for plugins.
LIST(APPEND ${PROJECT_NAME}_PLUGIN_LDFLAGS ${${PROJECT_NAME}_LINK_SRC_FLAGS})
# --- PLUGIN COMPILATION -----------------------------------------------
FOREACH(plugin ${libdg_plugins_src})
# Create the name of the library out of the name of the plugin.
GET_FILENAME_COMPONENT(pluginName ${plugin} NAME)
STRING(REGEX REPLACE "${srcextension}$" "" newsofile ${pluginName})
STRING(REGEX REPLACE ${srcextension}$ .h pluginHeader ${plugin})
# Specify the new target.
SET(plugin_add_srcsname ${newsofile}_additional_srcs)
SET(pluginTemplate ${newsofile}Template)
ADD_LIBRARY(${newsofile} ${plugin} ${pluginHeader} ${${pluginTemplate}} ${${plugin_add_srcsname}})
SET_TARGET_PROPERTIES(${newsofile} PROPERTIES
COMPILE_FLAGS "${${PROJECT_NAME}_CXXFLAGS}"
PREFIX ""
LIBRARY_OUTPUT_DIRECTORY "${${PROJECT_NAME}_BINARY_DIR}/lib/plugin")
# Make sure that this plugin depends upon the other specified dependencies.
SET(newsofile_plugins_dependencies ${${newsofile}_plugins_dependencies})
SET(newsofile_plugins_compile_flags ${${newsofile}_plugins_compile_flags})
SET(newsofile_plugins_link_flags ${${newsofile}_plugins_link_flags})
SET(localtarget_dependencies ${LIBRARY_NAME} ${newsofile_plugins_dependencies})
SET(local_plugins_compile ${${PROJECT_NAME}_CXX_FLAGS} ${newsofile_plugins_compile_flags})
SET(local_plugins_link_flags ${${PROJECT_NAME}_PLUGIN_LDFLAGS} ${newsofile_plugins_link_flags} )
# Make sure that this plugin is depend upon the global dependancies.
foreach (dependencyOrder ${localtarget_dependencies})
ADD_DEPENDENCIES(${newsofile} ${dependencyOrder})
endforeach (dependencyOrder)
link_directories(${LIBRARY_OUTPUT_PATH})
target_link_libraries(${newsofile} ${LIBRARY_NAME})
foreach (extraDependency ${newsofile_plugins_dependencies})
# Add the flags of the sub plugins.
LIST(APPEND local_plugins_compile ${${extraDependency}_plugins_compile_flags})
target_link_libraries(${newsofile} ${extraDependency})
endforeach (extraDependency)
LIST2STRING(_cf "${local_plugins_compile}")
LIST2STRING(_lf "${local_plugins_link_flags}")
SET_TARGET_PROPERTIES(${newsofile} PROPERTIES
COMPILE_FLAGS "${_cf} ${${PROJECT_NAME}_CXXFLAGS}"
LINK_FLAGS "${_lf}")
INSTALL(TARGETS ${newsofile}
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugin
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
ADD_DEPENDENCIES(${newsofile} header_${newsofile})
ENDFOREACH(plugin)
INSTALL(TARGETS ${plugin}
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugin)
ENDFOREACH(plugin)
\ No newline at end of file
# ---------------------------------------------------------------
# --- SOURCE FILE NAMES -----------------------------------------
# ---------------------------------------------------------------
SET(SOT_MODULE_NAME debug)
# --- Add your Source Files here.
SET(libdg_${SOT_MODULE_NAME}_src
debug/debug.cpp
)
SET(libdg_${SOT_MODULE_NAME}_plugins_src
debug/contiifstream.cpp
)
# ---------------------------------------------------------------
# --- GENERIC RULES ---------------------------------------------
# ---------------------------------------------------------------
SOT_SRC_SUBDIR_PROCESS()
......@@ -42,7 +42,7 @@
#include <fstream>
#include <sstream>
#include <stdarg.h>
#include <dynamic-graph/dynamicGraph-API.h>
#include <dynamic-graph/dynamic-graph-API.h>
/* -------------------------------------------------------------------------- */
......
# ---------------------------------------------------------------
# --- SOURCE FILE NAMES -----------------------------------------
# ---------------------------------------------------------------
SET(SOT_MODULE_NAME dgraph)
# --- Add your Source Files here.
SET(libdg_${SOT_MODULE_NAME}_src
dgraph/pool.cpp
dgraph/interpreter.cpp
dgraph/factory.cpp
dgraph/entity.cpp
dgraph/plugin-loader.cpp
)
SET(libdg_${SOT_MODULE_NAME}_templates "")
SET(libdg_${SOT_MODULE_NAME}_headers "")
SET(libdg_${SOT_MODULE_NAME}_plugins_headers "")
SET(libdg_${SOT_MODULE_NAME}_plugins_templates "")
SET(libdg_${SOT_MODULE_NAME}_plugins_src
dgraph/shell-functions.cpp
dgraph/shell-procedure.cpp
)
# Specify the compile flags for source file.
SET_SOURCE_FILES_PROPERTIES(${SOT_MODULE_NAME}/shell-functions.cpp
${SOT_MODULE_NAME}/shell-procedure.cpp
PROPERTIES
COMPILE_FLAGS "${MatrixAbstractLayer_cflags}" )
# ---------------------------------------------------------------
# --- GENERIC RULES ---------------------------------------------
# ---------------------------------------------------------------
SOT_SRC_SUBDIR_PROCESS()
......@@ -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/dynamicGraph-API.h>
#include <dynamic-graph/dynamic-graph-API.h>
/* --- STD --- */
#include <string>
......
......@@ -32,7 +32,7 @@
/* --- SOT --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/dynamicGraph-API.h>
#include <dynamic-graph/dynamic-graph-API.h>
namespace dynamicgraph {
......
......@@ -30,7 +30,7 @@
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/pool.h>
#include <dynamic-graph/dynamicGraph-API.h>
#include <dynamic-graph/dynamic-graph-API.h>
/* --- STD --- */
#include <string>
......
......@@ -33,7 +33,7 @@
/* --- SOT --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/dynamicGraph-API.h>
#include <dynamic-graph/dynamic-graph-API.h>
namespace dynamicgraph {
......
......@@ -32,7 +32,7 @@
/* --- SOT --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/dynamic