[CMake] clean

CMakeLists.txt

@@ -11,21 +11,12 @@ INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/eigen.cmake)
 INCLUDE(cmake/pthread.cmake)
-INCLUDE(cmake/cpack.cmake)
-include(cmake/header.cmake)
 include(cmake/python.cmake)
-
+INCLUDE(cmake/sphinx.cmake)
 
 SET(DOXYGEN_USE_MATHJAX YES)
 
 SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
-# Headers list.
-SET(${PROJECT_NAME}_HEADERS
-  include/dynamic-graph/python/interpreter.hh
-  include/dynamic-graph/python/api.hh
-  include/dynamic-graph/python/exception-python.hh
-
-)
 
 SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
 

doc/CMakeLists.txt

 # Copyright 2010, 2011, Florent Lamiraux, Thomas Moulard, JRL, CNRS/AIST
 
-INCLUDE(../cmake/sphinx.cmake)
-
 SPHINX_SETUP()
 SPHINX_FINALIZE()

include/CMakeLists.txt

 # Copyright 2010, 2011, Florent Lamiraux, CNRS
 
+SET(${PROJECT_NAME}_HEADERS
+  dynamic-graph/python/api.hh
+  dynamic-graph/python/exception-python.hh
+)

src/CMakeLists.txt

@@ -14,23 +14,23 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS} ${PYTHON_LIBRARY_DIRS})
 #
 SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_LIBRARY(${LIBRARY_NAME}
-  SHARED
-  interpreter.cc)
+    SHARED
+    interpreter.cc)
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
-  ${PYTHON_LIBRARY})
+    ${PYTHON_LIBRARY})
 TARGET_LINK_BOOST_PYTHON(${LIBRARY_NAME})
 
 IF(UNIX)
-  TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
-  TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CMAKE_DL_LIBS})
+    TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CMAKE_DL_LIBS})
 ENDIF(UNIX)
 
 SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
 PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
 
 INSTALL(TARGETS ${LIBRARY_NAME}
-  DESTINATION lib)
+    DESTINATION lib)
 
 #
 #
@@ -41,22 +41,22 @@ INSTALL(TARGETS ${LIBRARY_NAME}
 SET(PYTHON_MODULE wrap)
 
 ADD_LIBRARY(${PYTHON_MODULE}
-  MODULE
-  convert-dg-to-py.cc
-  debug-py.cc
-  dynamic-graph-py.cc
-  entity-py.cc
-  exception-python.cc
-  factory-py.cc
-  pool-py.cc
-  signal-base-py.cc
-  signal-caster-py.cc
-  signal-wrapper.cc
-)
+    MODULE
+    convert-dg-to-py.cc
+    debug-py.cc
+    dynamic-graph-py.cc
+    entity-py.cc
+    exception-python.cc
+    factory-py.cc
+    pool-py.cc
+    signal-base-py.cc
+    signal-caster-py.cc
+    signal-wrapper.cc
+    )
 
 # Remove prefix lib
 SET_TARGET_PROPERTIES(${PYTHON_MODULE}
-	PROPERTIES PREFIX "")
+    PROPERTIES PREFIX "")
 
 PKG_CONFIG_USE_DEPENDENCY(${PYTHON_MODULE} dynamic-graph)
 #TARGET_LINK_LIBRARIES(${PYTHON_MODULE} ${PYTHON_LIBRARY})
@@ -69,11 +69,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 # Installation
 #
 
-SET(PYTHON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/dynamic_graph)
-
-INSTALL(TARGETS ${PYTHON_MODULE}
-	       DESTINATION
-	       ${PYTHON_INSTALL_DIR})
+INSTALL(TARGETS ${PYTHON_MODULE} DESTINATION ${PYTHON_SITELIB}/dynamic_graph)
 
 SET (PYTHON_SOURCES
     __init__.py
@@ -83,25 +79,25 @@ SET (PYTHON_SOURCES
     matlab.py
     script_shortcuts.py
     tools.py
-)
+    )
 
 FOREACH (SOURCE ${PYTHON_SOURCES})
-  PYTHON_INSTALL_ON_SITE(dynamic_graph ${SOURCE} )
+    PYTHON_INSTALL_ON_SITE(dynamic_graph ${SOURCE})
 ENDFOREACH (SOURCE)
 
 # --- ADD the wrap on the dg modules
 # Tracer plugin
 IF(WIN32)
-SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer${CMAKE_STATIC_LIBRARY_SUFFIX})
+    SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE(WIN32)
-SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer${CMAKE_SHARED_LIBRARY_SUFFIX})
+    SET(TRACER_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer${CMAKE_SHARED_LIBRARY_SUFFIX})
 ENDIF(WIN32)
 DYNAMIC_GRAPH_PYTHON_MODULE("tracer" ${TRACER_PLUGIN} tracer-wrap)
 
 # TracerRealTime plugin
 IF(WIN32)
-SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer-real-time${CMAKE_STATIC_LIBRARY_SUFFIX})
+    SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer-real-time${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE(WIN32)
-SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer-real-time${CMAKE_SHARED_LIBRARY_SUFFIX})
+    SET(TRACERREALTIME_PLUGIN ${DYNAMIC_GRAPH_PLUGINDIR}/tracer-real-time${CMAKE_SHARED_LIBRARY_SUFFIX})
 ENDIF(WIN32)
 DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" ${TRACERREALTIME_PLUGIN} tracer_real_time-wrap)