Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions scripts/metapackages/jderobot-deps-dev.info.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions scripts/metapackages/jderobot-deps.info.in
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,4 +13,4 @@ Maintainer: Francisco Perez <f.perez475@gmail.com>
Private-Original-Maintainer: Victor Arribas <v.arribas.urjc@gmail.com>
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.