From c4a85e51ec799a7e696b84a034a152a2a94c15ab Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 4 Mar 2019 17:58:29 +0100 Subject: [PATCH] [CMake] details --- CMakeLists.txt | 39 +++++++++++++-------------------------- cmake | 2 +- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a8ddb0..b413810 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,5 @@ # Copyright 2016, Thomas Moulard, Olivier Stasse, JRL, CNRS/AIST # -# This file is part of sot-talos. -# sot-talos is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# sot-talos is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Lesser Public License for more details. You should have -# received a copy of the GNU Lesser General Public License along with -# sot-talos. If not, see . CMAKE_MINIMUM_REQUIRED(VERSION 2.6) @@ -19,12 +7,12 @@ INCLUDE(cmake/base.cmake) INCLUDE(cmake/boost.cmake) INCLUDE(cmake/eigen.cmake) INCLUDE(cmake/lapack.cmake) -INCLUDE(cmake/cpack.cmake) INCLUDE(cmake/ros.cmake) +SET(PROJECT_NAMESPACE stack-of-tasks) SET(PROJECT_NAME sot-talos) SET(PROJECT_DESCRIPTION "dynamic-graph package for Talos robot") -SET(PROJECT_URL "http://github.com/stack-of-tasks/sot-talos") +SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}") SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}") @@ -87,23 +75,23 @@ IF(TALOS_DATA_FOUND) # Configure files using motions from pyrene-motions package FOREACH(py_filename appli-test-simple-seq-play ) CONFIGURE_FILE( - ${PROJECT_SOURCE_DIR}/tests/${py_filename}.py.cmake - ${PROJECT_BINARY_DIR}/tests/${py_filename}.py - ) + ${PROJECT_SOURCE_DIR}/tests/${py_filename}.py.cmake + ${PROJECT_BINARY_DIR}/tests/${py_filename}.py + ) INSTALL(FILES - ${PROJECT_BINARY_DIR}/tests/${py_filename}.py - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests - ) + ${PROJECT_BINARY_DIR}/tests/${py_filename}.py + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests + ) ENDFOREACH(py_filename) # Install python files starting the application FOREACH(py_filename test-simple-seq-play ) INSTALL(FILES - ${PROJECT_SOURCE_DIR}/tests/${py_filename}.py - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests - ) + ${PROJECT_SOURCE_DIR}/tests/${py_filename}.py + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests + ) ENDFOREACH(py_filename) ENDIF(PYRENE_MOTIONS_FOUND) @@ -117,4 +105,3 @@ IF(TALOS_DATA_FOUND) ENDIF(TALOS_DATA_FOUND) SETUP_PROJECT_FINALIZE() -SETUP_PROJECT_CPACK() diff --git a/cmake b/cmake index 6ccc9f9..1d9aeca 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6ccc9f9b2a2ff510ae7754c515c72f8e38410447 +Subproject commit 1d9aeca25e970d2d967fd5be0fb93fe961db121b