[CMake] clean

stack-of-tasks · Mar 5, 2019 · 0c6742c · 0c6742c
1 parent 839df5d
commit 0c6742c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,30 +6,20 @@ INCLUDE(cmake/eigen.cmake)
 INCLUDE(cmake/python.cmake)
 INCLUDE(cmake/test.cmake)
 
+SET(PROJECT_NAMESPACE stack-of-tasks)
 SET(PROJECT_NAME parametric-curves)
 SET(PROJECT_DESCRIPTION "Template based classes for creating and manipulating parametric curves. Comes with extra options specific to end-effector trajectories in robotics." )
-SET(PROJECT_URL "http://github.com/stack-of-tasks/parameteric-curves")
+SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}")
 
 SET(DOXYGEN_USE_MATHJAX yes)
-
-
-#set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/build/")
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/")
-#set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/lib/")
+SET(CUSTOM_HEADER_DIR ${PROJECT_NAME})
 
 # Disable -Werror on Unix for now.
 SET(CXX_DISABLE_WERROR True)
 SET(CMAKE_VERBOSE_MAKEFILE True)
 
 SETUP_PROJECT()
 
-IF(WIN32)
-  SET(LINK copy_if_different)
-ELSE(WIN32)
-  SET(LINK create_symlink)
-ENDIF(WIN32)
-
-
 ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
 SET(BOOST_REQUIERED_COMPONENTS serialization)
 SET(BOOST_OPTIONAL_COMPONENTS "")
@@ -47,44 +37,13 @@ SEARCH_FOR_BOOST()
 SEARCH_FOR_EIGEN()
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 
-install(FILES
-  #	${CMAKE_SOURCE_DIR}/include/parametric-curves/bernstein.h
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/abstract-curve.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/MathDefs.h
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/spline.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/polynomial.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/infinite-sinusoid.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/infinite-const-acc.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/constant.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/linear-chirp.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/minimum-jerk.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/text-file.hpp
-  #	${CMAKE_SOURCE_DIR}/include/parametric-curves/bezier_curve.h
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/curve-constraint.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves
-  )
-
-install(FILES
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/eigen-matrix.hpp
-  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/serialization
-  )
-install(FILES
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/spatial/force-curve.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/spatial
-  )
-install(FILES
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/utils/file-io.hpp
-  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/utils
-  )
-
 IF(BUILD_PYTHON_INTERFACE)
   STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
   SET(PYWRAP ${PY_NAME}_pywrap)
   ADD_SUBDIRECTORY(python)
 ENDIF(BUILD_PYTHON_INTERFACE)
 
+ADD_SUBDIRECTORY (include/${PROJECT_NAME})
 ADD_SUBDIRECTORY (src/tests/spline_test)
 
 ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})

diff --git a/cmake b/cmake
diff --git a/include/parametric-curves/CMakeLists.txt b/include/parametric-curves/CMakeLists.txt
@@ -0,0 +1,31 @@
+install(FILES
+  #	bernstein.h
+  abstract-curve.hpp
+  MathDefs.h
+  spline.hpp
+  polynomial.hpp
+  infinite-sinusoid.hpp
+  infinite-const-acc.hpp
+  constant.hpp
+  linear-chirp.hpp
+  minimum-jerk.hpp
+  text-file.hpp
+  #	bezier_curve.h
+  curve-constraint.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves
+  )
+
+install(FILES
+  serialization/eigen-matrix.hpp
+  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/serialization
+  )
+install(FILES
+  spatial/force-curve.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/spatial
+  )
+install(FILES
+  utils/file-io.hpp
+  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/utils
+  )
+1 −0		.docs/index.rst
+6 −0		.docs/pages/other.rst
+22 −0		.docs/pages/projects.rst
+2 −1		GNUInstallDirs.cmake
+2 −2		README.md
+62 −8		base.cmake
+18 −11		boost.cmake
+17 −0		cmake_uninstall.cmake.in
+4 −1		config.hh.cmake
+62 −0		cxx11.cmake
+21 −21		dist.cmake
+15 −5		distcheck.cmake
+24 −10		doxygen.cmake
+4 −6		doxygen/Doxyfile.in
+43 −0		find-external/CDD/FindCDD.cmake
+42 −0		find-external/CLP/FindCLP.cmake
+0 −0		find-external/OpenRTM/FindOpenRTM.cmake
+43 −0		find-external/TinyXML/FindTinyXML.cmake
+43 −0		find-external/glpk/Findglpk.cmake
+42 −0		find-external/qpOASES/FindqpOASES.cmake
+62 −0		gtest.cmake
+15 −0		gtest/CMakeLists.txt.in
+11 −7		header.cmake
+80 −0		hpp.cmake
+29 −0		hpp/doc.cmake
+195 −0		hpp/doc/layout.xml
+121 −0		hpp/idl/omniidl_be_python_with_docstring.py
+29 −7		idl.cmake
+1 −1		openrtm.cmake
+84 −50		pkg-config.cmake
+69 −18		python.cmake
+11 −1		release.cmake
+1 −1		ros.cmake
+29 −13		test.cmake
+2 −0		version-script-test.lds
+54 −0		version-script.cmake
+40 −11		version.cmake