packaging

CMakeLists.txt

@@ -47,6 +47,7 @@ ENDIF(BUILD_PYTHON_INTERFACE)
 
 
 find_package (centroidal-dynamics-lib REQUIRED)
+find_package (Spline REQUIRED)
 
 # Declare Headers
 SET(${PROJECT_NAME}_HEADERS

cmake2/FindCLP.cmake

-# - Try to find libcdd
-# Once done this will define
-#  CLP_FOUND - System has CLP
-#  CLP_INCLUDE_DIRS - The CLP include directories
-#  CLP_LIBRARIES - The libraries needed to use CLP
-#  CLP_DEFINITIONS - Compiler switches required for using CLP
-
-# /usr/include/coin, /usr/lib/libClp.so
-
-find_path(CLP_INCLUDE_DIR coin/ClpSimplex.hpp
-          HINTS ${CLP_INCLUDEDIR}
-          PATH_SUFFIXES CLP )
-
-find_library(CLP_LIBRARY NAMES libclp.so
-             HINTS ${CLP_LIBDIR} ${CLP_LIBRARY_DIRS} )
-
-set(CLP_LIBRARIES ${CLP_LIBRARY} )
-set(CLP_INCLUDE_DIRS ${CLP_INCLUDE_DIR} )
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set CDD_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(CLP  DEFAULT_MSG
-                                  CLP_LIBRARY CLP_INCLUDE_DIR)
-
-mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY )

cmake2/FindSpline.cmake

+# - Try to find spline
+# Once done this will define
+#  SPLINE_FOUND - System has SPLINE
+#  SPLINE_INCLUDE_DIRS - The SPLINE include directories
+#  SPLINE_DEFINITIONS - Compiler switches required for using SPLINE
+
+# /usr/include/coin, /usr/lib/libSPLINE.so
+
+find_path(SPLINE_INCLUDE_DIR spline/bezier_curve.h
+          HINTS ${SPLINE_INCLUDEDIR}
+          PATH_SUFFIXES SPLINE )
+
+#~ find_library(SPLINE_LIBRARY NAMES libSPLINE.so
+             #~ HINTS ${SPLINE_LIBDIR} ${SPLINE_LIBRARY_DIRS} )
+
+set(SPLINE_INCLUDE_DIRS ${SPLINE_INCLUDE_DIR} )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set CDD_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(SPLINE  DEFAULT_MSG
+                                  SPLINE_INCLUDE_DIR)
+
+mark_as_advanced(SPLINE_INCLUDE_DIR)

cmake2/Findcentroidal-dynamics-lib.cmake

-# - Try to find libcdd
+# - Try to find centroidal-dynamics-lib
 # Once done this will define
 #  CDL_FOUND - System has CDL
 #  CDL_INCLUDE_DIRS - The CDL include directories
@@ -6,7 +6,7 @@
 #  CDL_DEFINITIONS - Compiler switches required for using CDL
 
 
-find_path(CDL_INCLUDE_DIR centroidal-dynamics-lib/centroidal_dynamics.h
+find_path(CDL_INCLUDE_DIR centroidal-dynamics-lib/centroidal_dynamics.hh
           HINTS ${CDL_INCLUDEDIR} /usr/include
           PATH_SUFFIXES CDL )
 

src/CMakeLists.txt

@@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 2.6)
 
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
-include_directories("${INCLUDE_DIR}")
-include_directories("${EIGEN3_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${EIGEN3_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${SPLINE_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${CDL_INCLUDE_DIR}")
 
 
 SET(LIBRARY_NAME ${PROJECT_NAME})

tests/CMakeLists.txt

@@ -3,8 +3,10 @@ cmake_minimum_required(VERSION 2.6)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/tests)
-include_directories("${INCLUDE_DIR}")
-include_directories("${EIGEN3_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${EIGEN3_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${SPLINE_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES("${CDL_INCLUDE_DIR}")
 
 
 # Make Boost.Test generates the main function in test cases.