clean cmake & write tests

Author: nim65s

AUTHORS

@@ -1,44 +1,41 @@
 #
-#  Copyright 2010 CNRS
+#  Copyright 2010, 2018 CNRS
 #  Author: Florent Lamiraux
 #
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-SET (CXX_DISABLE_WERROR ON)
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
-INCLUDE(cmake/lapack.cmake)
-INCLUDE(cmake/cpack.cmake)
+INCLUDE(cmake/test.cmake)
+INCLUDE(cmake/python.cmake)
 
 SET(PROJECT_NAME dynamic-graph-tutorial)
-project(${PROJECT_NAME})
-
 SET(PROJECT_DESCRIPTION "Tutorial for dynamic-graph")
-SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph-tutorial")
 
-SET(${PROJECT_NAME}_HEADERS
-    include/dynamic-graph/tutorial/inverted-pendulum.hh
-    include/dynamic-graph/tutorial/feedback-controller.hh
-)
-#
-# Look for dependencies
-#
+SET(PROJECT_URL "http://github.com/stack-of-tasks/${PROJECT_NAME}")
 
 SETUP_PROJECT()
 
-#
-#  Documentation dependency to package dynamic-graph
-#
-
 ADD_REQUIRED_DEPENDENCY("dynamic-graph")
 
-#
-#  Dependency to package dynamic-graph-python
-#
-ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
+SET(BOOST_COMPONENTS unit_test_framework)
+
+OPTION (BUILD_PYTHON_INTERFACE "Build the python binding" ON)
+IF(BUILD_PYTHON_INTERFACE)
+  ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
+  FINDPYTHON()
+  STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
+  SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} python)
+  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+ENDIF(BUILD_PYTHON_INTERFACE)
+
+SEARCH_FOR_BOOST()
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 
+ADD_SUBDIRECTORY(include/dynamic-graph/tutorial)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(tests)
 
 SETUP_PROJECT_FINALIZE()

CMakeLists.txt

@@ -0,0 +1,9 @@
+SET(${PROJECT_NAME}_HEADERS}
+  inverted-pendulum.hh
+  feedback-controller.hh
+  )
+
+INSTALL(FILES
+  ${${PROJECT_NAME}_HEADERS}
+  DESTINATION include/${PROJECT_NAME}
+  )

COPYING

@@ -1,4 +1,4 @@
-# Copyright 2010, Florent Lamiraux, CNRS
+# Copyright 2010, 2018, Florent Lamiraux, CNRS
 #
 # This file is part of sot-core.
 # sot-core is free software: you can redistribute it and/or
@@ -13,33 +13,23 @@
 # received a copy of the GNU Lesser General Public License along with
 # dynamic-graph-tutorial. If not, see <http://www.gnu.org/licenses/>.
 
-# Libraries DEFINITIONS and INCLUDES
 
-INCLUDE(../cmake/python.cmake)
-
-SET(LIBRARY_NAME ${PROJECT_NAME})
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-
-# provide path to dependency libraries
-LINK_DIRECTORIES(${DYNAMIC_GRAPH_PYTHON_LIBRARY_DIRS} ${PYTHON_LIBRARY_DIRS})
-
-ADD_LIBRARY(${LIBRARY_NAME}
-  SHARED
-  inverted-pendulum.cc
-  feedback-controller.cc
+SET(${PROJECT_NAME}_SOURCES
+  inverted-pendulum
+  feedback-controller
   )
 
-SET_TARGET_PROPERTIES(${LIBRARY_NAME}
-  PROPERTIES
-  SOVERSION ${PROJECT_VERSION}
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
+SET(${PY_NAME}_PYTHON
+  simu.py
+  )
 
-# Add dynamic-graph-python compilation flags and link to dependency libraries
-PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} dynamic-graph-python)
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES})
+PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} dynamic-graph)
 
-INSTALL(TARGETS ${LIBRARY_NAME}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+IF(BUILD_PYTHON_INTERFACE)
+  PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} dynamic-graph-python)
+  DYNAMIC_GRAPH_PYTHON_MODULE("tutorial" ${PROJECT_NAME} wrap)
+  INSTALL(FILES ${${PY_NAME}_PYTHON} DESTINATION "${PYTHON_SITELIB}/dynamic-graph/tutorial/")
+ENDIF(BUILD_PYTHON_INTERFACE)
 
-# Create a python module containing new Python entity classes
-DYNAMIC_GRAPH_PYTHON_MODULE("tutorial" ${LIBRARY_NAME} wrap)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)