From 3c54178fcd85e8b6f97c9f18279a534d1e5efe08 Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Fri, 21 Apr 2017 08:07:12 +0000 Subject: [PATCH] [issue #782] added options to generate only ice packages --- CMakeLists.txt | 14 +++++++++++--- scripts/metapackages/jderobot-deps-dev.info.in | 8 ++++---- scripts/metapackages/jderobot-deps.info.in | 10 +++++----- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a42ede6d5..eea7472d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,12 @@ -project (jderobot) +IF(NOT DEFINED ENABLE_ROS) + SET(ENABLE_ROS ON) +ENDIF(NOT DEFINED ENABLE_ROS) + +if(ENABLE_ROS) + project (jderobot) +else() + project (jderobot-only-ice) +endif() cmake_minimum_required(VERSION 2.8) @@ -260,10 +268,10 @@ include(scripts/metapackages/FindMetapackages.cmake) SET (PACKAGE_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION}) set(PACKAGE_DEPENDS "${DEPS}") -configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps.info.in ${CMAKE_BINARY_DIR}/jderobot-deps_${PACKAGE_VERSION}_all.info) +configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps.info.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-deps_${PACKAGE_VERSION}_all.info) set(PACKAGE_DEPENDS "${DEPS_DEV}") -configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps-dev.info.in ${CMAKE_BINARY_DIR}/jderobot-deps-dev_${PACKAGE_VERSION}_all.info) +configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps-dev.info.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-deps-dev_${PACKAGE_VERSION}_all.info) execute_process( COMMAND ${MAKE_PACKAGE_EXECUTABLE} diff --git a/scripts/metapackages/jderobot-deps-dev.info.in b/scripts/metapackages/jderobot-deps-dev.info.in index 9b7c92284..c4da698ae 100644 --- a/scripts/metapackages/jderobot-deps-dev.info.in +++ b/scripts/metapackages/jderobot-deps-dev.info.in @@ -1,9 +1,9 @@ -Package: jderobot-deps-dev +Package: ${PROJECT_NAME}-deps-dev Version: ${PACKAGE_VERSION} Architecture: all -Provides: jderobot-deps-dev -Conflicts: jderobot-deps-dev -Replaces: jderobot-deps-dev +Provides: ${PROJECT_NAME}-deps-dev +Conflicts: ${PROJECT_NAME}-deps-dev +Replaces: ${PROJECT_NAME}-deps-dev Section: net Priority: extra Size: 0 diff --git a/scripts/metapackages/jderobot-deps.info.in b/scripts/metapackages/jderobot-deps.info.in index 705febfe4..07d80417b 100644 --- a/scripts/metapackages/jderobot-deps.info.in +++ b/scripts/metapackages/jderobot-deps.info.in @@ -1,9 +1,9 @@ -Package: jderobot-deps +Package: ${PROJECT_NAME}-deps Version: ${PACKAGE_VERSION} Architecture: all -Provides: jderobot-deps -Conflicts: jderobot-deps -Replaces: jderobot-deps +Provides: ${PROJECT_NAME}-deps +Conflicts: ${PROJECT_NAME}-deps +Replaces: ${PROJECT_NAME}-deps Priority: extra Section: net Size: 0 @@ -13,4 +13,4 @@ Maintainer: Francisco Perez Private-Original-Maintainer: Victor Arribas Homepage: http://jderobot.org Description: Metapackage that gathers all libraries required by JdeRobot framework. - Jderobot is a software development suite for robotics applications. + Jderobot is a software development suite for robotics applications. \ No newline at end of file