[Jderobot-admin] jderobot-r1136 - in trunk: . Deps/boost Deps/gazebo Deps/gtk2 Deps/ice Deps/libusb Deps/libxml++ Deps/libxml2 Deps/opencv Deps/opengl Deps/openni2 Deps/pthread Deps/qt Deps/tinyxml Deps/xerces
rocapal en jderobot.org
rocapal en jderobot.org
Jue Ene 9 18:32:12 CET 2014
Author: rocapal
Date: 2014-01-09 18:32:12 +0100 (Thu, 09 Jan 2014)
New Revision: 1136
Modified:
trunk/CMakeLists.txt
trunk/Deps/boost/CMakeLists.txt
trunk/Deps/gazebo/CMakeLists.txt
trunk/Deps/gtk2/CMakeLists.txt
trunk/Deps/ice/CMakeLists.txt
trunk/Deps/libusb/CMakeLists.txt
trunk/Deps/libxml++/CMakeLists.txt
trunk/Deps/libxml2/CMakeLists.txt
trunk/Deps/opencv/CMakeLists.txt
trunk/Deps/opengl/CMakeLists.txt
trunk/Deps/openni2/CMakeLists.txt
trunk/Deps/pthread/CMakeLists.txt
trunk/Deps/qt/CMakeLists.txt
trunk/Deps/tinyxml/CMakeLists.txt
trunk/Deps/xerces/CMakeLists.txt
Log:
#76 Added dependencies to deb packages
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -181,6 +181,17 @@
# Deb packages
#
+# Determine current architecture
+macro(dpkg_arch VAR_NAME)
+ find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
+ if (DPKG_PROGRAM)
+ execute_process(
+ COMMAND ${DPKG_PROGRAM} --print-architecture
+ OUTPUT_VARIABLE ${VAR_NAME}
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ endif(DPKG_PROGRAM)
+endmacro(dpkg_arch)
include (InstallRequiredSystemLibraries)
SET (CPACK_GENERATOR "DEB")
@@ -190,17 +201,22 @@
SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
-SET (VERSION 5.2.0-1)
+SET (VERSION 5.2.2-1)
# CPack version numbers for release tarball name.
SET (CPACK_PACKAGE_VERSION_MAJOR 5)
SET (CPACK_PACKAGE_VERSION_MINOR 2)
-SET (CPACK_PACKAGE_VERSION_PATCH 0)
+SET (CPACK_PACKAGE_VERSION_PATCH 2)
SET ($ {VERSION} CPACK_DEBIAN_PACKAGE_VERSION)
SET (CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
SET (CPACK_DEBIAN_PACKAGE_SECTION "net")
-SET (CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+#SET (CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
+dpkg_arch(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+
+MESSAGE("Dependencias: ${DEPS}")
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${DEPS}")
+
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/postinst"
"${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/postrm")
@@ -209,7 +225,7 @@
SET (CPACK_PACKAGE_DESCRIPTION "jderobot is a software development suite for robotics applications, written in C++ language. It provides a programming environment where the robot control program is made up of a collection of several concurrent asynchronous threads named schemas. It is based on JDE cognitive architecture for autonomous robots.")
SET (CPACK_PACKAGE_CONTACT "Roberto Calvo <rocapal en gsyc.urjc.es>")
-SET (CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${VERSION}_${CPACK_DEBIAN_ARCHITECTURE}")
+SET (CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
SET (CPACK_COMPONENTS_ALL Libraries ApplicationData)
include (CPack Documentation)
Modified: trunk/Deps/boost/CMakeLists.txt
===================================================================
--- trunk/Deps/boost/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/boost/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -2,3 +2,6 @@
find_package(Boost COMPONENTS system filesystem REQUIRED)
INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+# ubuntu
+
+SET(DEPS "${DEPS} libboost-system1.46.1, libboost-filesystem1.46.1,")
Modified: trunk/Deps/gazebo/CMakeLists.txt
===================================================================
--- trunk/Deps/gazebo/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/gazebo/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -16,6 +16,7 @@
if (GAZEBO_INCLUDE_DIRS)
MESSAGE("*** GAZEBO LIBRARIES FOUND")
+ SET(DEPS "${DEPS} gazebo,")
else()
MESSAGE("*** GAZEBO LIBRARIES NOT FOUND")
endif()
Modified: trunk/Deps/gtk2/CMakeLists.txt
===================================================================
--- trunk/Deps/gtk2/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/gtk2/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -8,3 +8,6 @@
PKG_CHECK_MODULES(libgnomecanvas REQUIRED libgnomecanvas-2.0)
PKG_CHECK_MODULES(libgnomecanvasmm REQUIRED libgnomecanvasmm-2.6)
PKG_CHECK_MODULES(gtkglextmm REQUIRED gtkglextmm-1.2)
+
+
+SET(DEPS "${DEPS} libgtkgl2.0-1, libgtkmm-2.4-1c2a, libglademm-2.4-1c2a, libgnomecanvas2-0, libgnomecanvasmm-2.6-1c2a, libgnomecanvasmm-2.6-1c2a, libgtkglextmm-x11-1.2-0,")
Modified: trunk/Deps/ice/CMakeLists.txt
===================================================================
--- trunk/Deps/ice/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/ice/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -15,6 +15,9 @@
link_directories(${ZeroCIceStorm_LIBRARY})
include_directories(${ZeroCIce_INCLUDE_DIR})
link_directories(${ZeroCIce_LIBRARIES})
+
+ SET(DEPS "${DEPS} libzeroc-ice34, libiceutil34, libicestorm34,")
+
ENDIF( ZeroCIceUtil_LIBRARY )
ENDIF( ZeroCIceStorm_LIBRARY )
@@ -25,3 +28,4 @@
IF(NOT ZeroCIceUtil_LIBRARY )
MESSAGE("*** IceUtil not found")
ENDIF()
+
Modified: trunk/Deps/libusb/CMakeLists.txt
===================================================================
--- trunk/Deps/libusb/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/libusb/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -2,6 +2,9 @@
if (LIBUSB_INCLUDE_DIRS)
MESSAGE("*** libusb FOUND")
+ SET(DEPS "${DEPS} libusb-1.0,")
else()
MESSAGE("*** libusb NOT FOUND")
endif()
+
+
Modified: trunk/Deps/libxml++/CMakeLists.txt
===================================================================
--- trunk/Deps/libxml++/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/libxml++/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -6,6 +6,7 @@
IF (libxmlpp_INCLUDE_DIRS)
MESSAGE("Libxml++ libraries found at ${libxmlpp_LIBRARY_DIRS}")
+ SET(DEPS "${DEPS} libxml++2.6-2,")
ELSE()
MESSAGE ("*** Libxml++ not found")
ENDIF()
Modified: trunk/Deps/libxml2/CMakeLists.txt
===================================================================
--- trunk/Deps/libxml2/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/libxml2/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -9,6 +9,9 @@
SET (LIBXML2_LIBRARIES ${LIBXML2_LIBRARY1} )
IF( LIBXML2_LIBRARIES )
#MESSAGE("LIBXML2 LIBRARY FOUND IN ${LIBXML2_LIBRARIES}")
+
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libxml2")
+
ENDIF(LIBXML2_LIBRARIES )
ENDIF(LIBXML2_INCLUDE_DIR)
Modified: trunk/Deps/opencv/CMakeLists.txt
===================================================================
--- trunk/Deps/opencv/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/opencv/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -17,6 +17,8 @@
SET (OpenCVGUI_LIBRARIES ${OpenCV_LIBRARY2} ${OpenCV_LIBRARY3} ${OpenCV_LIBRARY4} ${OpenCV_LIBRARY6} ${OpenCV_LIBRARY8} ${OpenCV_LIBRARY11})
IF( OpenCV_LIBRARIES )
#MESSAGE("OPENCV LIBRARY FOUND IN ${OpenCV_LIBRARIES}")
+ SET(DEPS "${DEPS}libopencv-calib3d2.3, libopencv-contrib2.3, libopencv-core2.3, libopencv-features2d2.3, libopencv-flann2.3, libopencv-gpu2.3, libopencv-highgui2.3, libopencv-imgproc2.3, libopencv-legacy2.3, libopencv-ml2.3, libopencv-objdetect2.3, libopencv-video2.3, libcv2.3, libcvaux2.3, libhighgui2.3, libopencv-highgui2.3,")
+
ENDIF( OpenCV_LIBRARIES )
ENDIF(OpenCV_INCLUDE_DIR)
Modified: trunk/Deps/opengl/CMakeLists.txt
===================================================================
--- trunk/Deps/opengl/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/opengl/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -8,6 +8,7 @@
IF (GLUT_LIBRARIES)
MESSAGE("OpenGL libraries found at ${GLUT_LIBRARY}")
+ SET(DEPS "${DEPS}freeglut3, libglu1-mesa,")
ELSE()
MESSAGE ("*** OpenGL not found")
ENDIF()
Modified: trunk/Deps/openni2/CMakeLists.txt
===================================================================
--- trunk/Deps/openni2/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/openni2/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -10,6 +10,7 @@
message("-------------CMake will install local OpenNI2 lib and Driver")
endif()
include_directories(${OPENNI2_INC})
+ SET(DEPS "${DEPS} openni2,")
ELSE()
message("OpenNI2 library not found")
ENDIF()
Modified: trunk/Deps/pthread/CMakeLists.txt
===================================================================
--- trunk/Deps/pthread/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/pthread/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -1,3 +1,4 @@
include(FindPkgConfig)
find_package(Threads)
+SET(DEPS "${DEPS} libpthread-stubs0,")
Modified: trunk/Deps/qt/CMakeLists.txt
===================================================================
--- trunk/Deps/qt/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/qt/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -12,6 +12,8 @@
if (QT_LIBRARIES_JDE)
SET(QT_COMPILE TRUE)
MESSAGE("*** QT LIBRARIES Found LIBRARIES FOUND")
+
+ SET(DEPS "${DEPS} libqtcore4, libqt4-opengl,")
else()
SET(QT_COMPILE FALSE)
MESSAGE("*** QT LIBRARIES NOT FOUND")
Modified: trunk/Deps/tinyxml/CMakeLists.txt
===================================================================
--- trunk/Deps/tinyxml/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/tinyxml/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -9,6 +9,7 @@
SET (LIBTINYXML_LIBRARIES ${LIBTINYXML_LIBRARY1} )
IF( LIBTINYXML_LIBRARIES )
#MESSAGE("LIBTINYXML LIBRARY FOUND IN ${LIBTINYXML_LIBRARIES}")
+ SET(DEPS "${DEPS} libtinyxml2.6.2,")
ENDIF(LIBTINYXML_LIBRARIES )
ENDIF(LIBTINYXML_INCLUDE_DIR)
Modified: trunk/Deps/xerces/CMakeLists.txt
===================================================================
--- trunk/Deps/xerces/CMakeLists.txt 2013-12-30 16:38:22 UTC (rev 1135)
+++ trunk/Deps/xerces/CMakeLists.txt 2014-01-09 17:32:12 UTC (rev 1136)
@@ -7,6 +7,8 @@
MESSAGE ("${xerces_INCLUDE_DIR}")
include_directories(${xerces_INCLUDE_DIR})
link_directories(${xerces_LIBRARIES})
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libxerces-c3.1")
+
ENDIF( xerces_LIBRARIES )
ENDIF(xerces_INCLUDE_DIR)
More information about the Jderobot-admin
mailing list