Merge branch 'topic/jrl-mal' of github.com:jrl-umi3218/dynamic-graph-python into topic/jrl-mal

Conflicts:
	include/CMakeLists.txt

CMakeLists.txt

@@ -19,12 +19,21 @@ INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/pthread.cmake)
 INCLUDE(cmake/cpack.cmake)
+include(cmake/header.cmake)
 
 SET(PROJECT_NAME dynamic-graph-python)
 SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
 SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph-python")
+SET(PROJECT_VERSION 1.99)
 
 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
+
+)
 
 # Defines paths.
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)

include/CMakeLists.txt

@@ -13,10 +13,3 @@
 # received a copy of the GNU Lesser General Public License along with
 # dynamic-graph-python. If not, see <http://www.gnu.org/licenses/>.
 
-include(../cmake/header.cmake)
-
-# Headers list.
-SET(${PROJECT_NAME}_HEADERS
-  interpreter.hh
-  exception-python.hh
-)

include/dynamic-graph/python/interpreter.hh

@@ -23,6 +23,8 @@
 #ifndef DYNAMIC_GRAPH_PYTHON_INTERPRETER_H
 # define DYNAMIC_GRAPH_PYTHON_INTERPRETER_H
 
+#include "dynamic-graph/python/api.hh"
+
 namespace dynamicgraph {
   namespace python {
       ///