[CMake] clean headers

CMakeLists.txt

@@ -21,9 +21,10 @@ INCLUDE(cmake/eigen.cmake)
 INCLUDE(cmake/pthread.cmake)
 INCLUDE(cmake/cpack.cmake)
 
+SET(PROJECT_ORG stack-of-tasks)
 SET(PROJECT_NAME dynamic-graph)
 SET(PROJECT_DESCRIPTION "Dynamic graph library")
-SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph")
+SET(PROJECT_URL "http://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
 SET(PROJECT_SUFFIX "-v3")
 
 SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}")
@@ -54,7 +55,7 @@ SET(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/plugin")
 SET(PKG_CONFIG_EXTRA "plugindir=${PLUGINDIR}")
 
 # Add dependency toward dynamic graph library in pkg-config file.
-PKG_CONFIG_APPEND_LIBS("dynamic-graph")
+PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
 
 # Search for Boost.
 SEARCH_FOR_BOOST()
@@ -64,7 +65,7 @@ SEARCH_FOR_PTHREAD()
 SEARCH_FOR_EIGEN()
 
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(include)
+ADD_SUBDIRECTORY(include/${PROJECT_NAME})
 ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(share)
 

include/CMakeLists.txt

-# Copyright 2010, Olivier Stasse, JRL, CNRS/AIST
-#
-# This file is part of dynamic-graph.
-# dynamic-graph is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-#
-# dynamic-graph is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Lesser Public License for more details.  You should have
-# received a copy of the GNU Lesser General Public License along with
-# dynamic-graph. If not, see <http://www.gnu.org/licenses/>.
-
-CONFIGURE_FILE(
-	${PROJECT_NAME}/import-default-paths.h.cmake
-	${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/import-default-paths.h)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/import-default-paths.h
-       DESTINATION include/${PROJECT_NAME}
-       PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-)
-
-
-# Headers list.
-SET(${PROJECT_NAME}_HEADERS
-fwd.hh
-null-ptr.hh
-contiifstream.h
-debug.h
-real-time-logger.h
-
-dynamic-graph-api.h
-
-entity.h
-factory.h
-pool.h
-
-exception-abstract.h
-exception-factory.h
-exception-signal.h
-exception-traces.h
-
-signal.h
-signal-array.h
-signal-base.h
-signal-ptr.h
-signal-time-dependent.h
-signal-ptr.t.cpp
-signal.t.cpp
-time-dependency.h
-time-dependency.t.cpp
-signal-caster.h
-signal-cast-helper.h
-all-signals.h
-signal-helper.h
-entity-helper.h
-
-tracer.h
-tracer-real-time.h
-
-command.h
-eigen-io.h
-linear-algebra.h
-value.h
-
-command-setter.h
-command-setter.t.cpp
-command-getter.h
-command-getter.t.cpp
-command-direct-getter.h
-command-direct-setter.h
-command-bind.h
-all-commands.h
-)
-
-# 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 include/${PROJECT_NAME}
-       PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-)

include/dynamic-graph/CMakeLists.txt

+SET(${PROJECT_NAME}_HEADERS
+  fwd.hh
+  null-ptr.hh
+  contiifstream.h
+  debug.h
+  real-time-logger.h
+
+  dynamic-graph-api.h
+
+  entity.h
+  factory.h
+  pool.h
+
+  exception-abstract.h
+  exception-factory.h
+  exception-signal.h
+  exception-traces.h
+
+  signal.h
+  signal-array.h
+  signal-base.h
+  signal-ptr.h
+  signal-time-dependent.h
+  signal-ptr.t.cpp
+  signal.t.cpp
+  time-dependency.h
+  time-dependency.t.cpp
+  signal-caster.h
+  signal-cast-helper.h
+  all-signals.h
+  signal-helper.h
+  entity-helper.h
+
+  tracer.h
+  tracer-real-time.h
+
+  command.h
+  eigen-io.h
+  linear-algebra.h
+  value.h
+
+  command-setter.h
+  command-setter.t.cpp
+  command-getter.h
+  command-getter.t.cpp
+  command-direct-getter.h
+  command-direct-setter.h
+  command-bind.h
+  all-commands.h
+  )
+
+INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
+  DESTINATION include/${PROJECT_NAME}
+  )

include/dynamic-graph/import-default-paths.h.cmake

-/* -*- c++ -*-
- *
- * Copyright 2010,
- * François Bleibel,
- * Olivier Stasse,
- *
- * CNRS/AIST
- *
- * This file is part of dynamic-graph.
- * dynamic-graph is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- * dynamic-graph is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.  You should
- * have received a copy of the GNU Lesser General Public License along
- * with dynamic-graph.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DG_FACTORY_COMMAND_IMPORT_DEFAULT_PATHS_H
-# define DG_FACTORY_COMMAND_IMPORT_DEFAULT_PATHS_H
-
-/// Default script path as known by CMake at configure time.
-# define DG_IMPORT_DEFAULT_PATHS "@DG_IMPORT_DEFAULT_PATHS@"
-
-#endif //! SOT_FACTORY_COMMAND_IMPORT_DEFAULT_PATHS_H