[Jderobot-admin] jderobot-r879 - in trunk/src/components: calibrator/build calibratorKinect calibratorKinect/build kinectViewer/build wiimoteClient/build
frivas en jderobot.org
frivas en jderobot.org
Mie Mar 6 16:31:37 CET 2013
Author: frivas
Date: 2013-03-06 16:30:36 +0100 (Wed, 06 Mar 2013)
New Revision: 879
Added:
trunk/src/components/calibratorKinect/build/
trunk/src/components/calibratorKinect/build/CMakeLists.txt
trunk/src/components/calibratorKinect/build/cmake_uninstall.cmake.in
Modified:
trunk/src/components/calibrator/build/CMakeLists.txt
trunk/src/components/kinectViewer/build/CMakeLists.txt
trunk/src/components/wiimoteClient/build/CMakeLists.txt
Log:
solved cmake problems linkin opengl on build directory
Modified: trunk/src/components/calibrator/build/CMakeLists.txt
===================================================================
--- trunk/src/components/calibrator/build/CMakeLists.txt 2013-03-05 17:25:06 UTC (rev 878)
+++ trunk/src/components/calibrator/build/CMakeLists.txt 2013-03-06 15:30:36 UTC (rev 879)
@@ -66,6 +66,7 @@
#include(${DEPS_DIR}/xerces/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/opengl/CMakeLists.txt)
#include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
Added: trunk/src/components/calibratorKinect/build/CMakeLists.txt
===================================================================
--- trunk/src/components/calibratorKinect/build/CMakeLists.txt (rev 0)
+++ trunk/src/components/calibratorKinect/build/CMakeLists.txt 2013-03-06 15:30:36 UTC (rev 879)
@@ -0,0 +1,133 @@
+project (JDEROBOT_KINECTVIEWER)
+
+cmake_minimum_required(VERSION 2.8)
+
+# ENV VARS
+SET(gladedir ./)
+
+SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
+SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
+SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
+SET( LIBS_NEEDED bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
+SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
+
+###################
+# #
+# CHECK SYSTEM #
+# #
+###################
+
+ # FIND & CHECK PRINCIPAL LIBRARIES
+
+include(FindPkgConfig)
+
+PKG_CHECK_MODULES(opencv REQUIRED opencv)
+include_directories(${opencv_INCLUDE_DIRS})
+link_directories(${opencv_LIBRARY_DIRS})
+
+#PKG_CHECK_MODULES(gtk20 REQUIRED gtk+-2.0)
+#include_directories(${gtk20_INCLUDE_DIRS})
+#link_directories(${gtk20_LIBRARY_DIRS})
+
+#PKG_CHECK_MODULES(gtkgl20 REQUIRED gtkgl-2.0)
+#include_directories(${gtkgl20_INCLUDE_DIRS})
+#link_directories(${gtkgl20_LIBRARY_DIRS})
+
+PKG_CHECK_MODULES(gtkmm REQUIRED gtkmm-2.4)
+include_directories(${gtkmm_INCLUDE_DIRS})
+link_directories(${gtkmm_LIBRARY_DIRS})
+
+PKG_CHECK_MODULES(libglademm REQUIRED libglademm-2.4)
+include_directories(${libglademm_INCLUDE_DIRS})
+link_directories(${libglademm_LIBRARY_DIRS})
+
+#PKG_CHECK_MODULES(gthread REQUIRED gthread-2.0)
+#include_directories(${gthread_INCLUDE_DIRS})
+#link_directories(${gthread_LIBRARY_DIRS})
+
+#PKG_CHECK_MODULES(libgnomecanvas REQUIRED libgnomecanvas-2.0)
+#include_directories(${libgnomecanvas_INCLUDE_DIRS})
+#link_directories(${libgnomecanvas_LIBRARY_DIRS})
+
+#PKG_CHECK_MODULES(libgnomecanvasmm REQUIRED libgnomecanvasmm-2.6)
+#include_directories(${libgnomecanvasmm_INCLUDE_DIRS})
+#link_directories(${libgnomecanvasmm_LIBRARY_DIRS})
+
+PKG_CHECK_MODULES(gtkglextmm REQUIRED gtkglextmm-1.2)
+include_directories(${gtkglextmm_INCLUDE_DIRS})
+link_directories(${gtkglextmm_LIBRARY_DIRS})
+
+#PKG_CHECK_MODULES(gsl REQUIRED gsl)
+#include_directories(${gsl_INCLUDE_DIRS})
+#link_directories(${gsl_LIBRARIES_DIRS})
+
+# FIND AND CHECK OTHER DEPENDENCES
+include(${DEPS_DIR}/gearbox/CMakeLists.txt)
+#include(${DEPS_DIR}/fireware/CMakeLists.txt)
+#include(${DEPS_DIR}/pcl/CMakeLists.txt)
+#include(${DEPS_DIR}/player/CMakeLists.txt)
+#include(${DEPS_DIR}/xerces/CMakeLists.txt)
+include(${DEPS_DIR}/ice/CMakeLists.txt)
+include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/opengl/CMakeLists.txt)
+
+# START RECURSIVE
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+###################
+# #
+# INSTALL #
+# #
+###################
+
+# Install libraries
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/interfaces/cpp/jderobot/libJderobotInterfaces.so DESTINATION /usr/local/lib/jderobot)
+
+FOREACH(currentLibFile ${LIBS_NEEDED})
+ SET (new_lib "lib${currentLibFile}.so")
+ MESSAGE("${new_lib}")
+ INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libs/${currentLibFile}/${new_lib} DESTINATION /usr/local/lib/jderobot)
+ENDFOREACH(currentLibFile)
+
+# Install libraries headers
+FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libs/*.h)
+FOREACH(currentSourceFile ${HEADERS_FILES})
+ string(REGEX REPLACE ".*/(.*/).*.h" "\\1" new_source1 ${currentSourceFile})
+ INSTALL (FILES ${currentSourceFile} DESTINATION /usr/local/include/jderobot/${new_source1})
+ENDFOREACH(currentSourceFile)
+
+# Install Executables
+FILE(GLOB_RECURSE BIN_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../*cfg)
+ string(REGEX REPLACE ".*/(.*).cfg" "\\1" new_source1 ${BIN_FILES})
+INSTALL (FILES ../${new_source1} DESTINATION /usr/local/bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+
+# Install interfaces headers
+FILE(GLOB HEADER_INTERFACE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/interfaces/cpp/jderobot/*.h)
+INSTALL (FILES ${HEADER_INTERFACE_FILES} DESTINATION /usr/local/include/jderobot/jderobot)
+
+# Install slice
+FILE(GLOB SLICE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/interfaces/slice/jderobot/*.ice)
+INSTALL (FILES ${SLICE_FILES} DESTINATION /usr/local/include/jderobot/slice)
+
+# Install CONF
+FILE(GLOB_RECURSE CONF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../*cfg)
+INSTALL (FILES ${CONF_FILES} DESTINATION /usr/local/share/jderobot/conf)
+
+# Install Glade
+FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../*.glade)
+INSTALL (FILES ${GLADE_FILES} DESTINATION /usr/local/share/jderobot/glade)
+
+###################
+# #
+# UNINSTALL #
+# #
+###################
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
Added: trunk/src/components/calibratorKinect/build/cmake_uninstall.cmake.in
===================================================================
--- trunk/src/components/calibratorKinect/build/cmake_uninstall.cmake.in (rev 0)
+++ trunk/src/components/calibratorKinect/build/cmake_uninstall.cmake.in 2013-03-06 15:30:36 UTC (rev 879)
@@ -0,0 +1,22 @@
+if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+list(REVERSE files)
+foreach (file ${files})
+ message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ if (EXISTS "$ENV{DESTDIR}${file}")
+ execute_process(
+ COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
+ OUTPUT_VARIABLE rm_out
+ RESULT_VARIABLE rm_retval
+ )
+ if(NOT ${rm_retval} EQUAL 0)
+ message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ endif (NOT ${rm_retval} EQUAL 0)
+ else (EXISTS "$ENV{DESTDIR}${file}")
+ message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ endif (EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)
\ No newline at end of file
Modified: trunk/src/components/kinectViewer/build/CMakeLists.txt
===================================================================
--- trunk/src/components/kinectViewer/build/CMakeLists.txt 2013-03-05 17:25:06 UTC (rev 878)
+++ trunk/src/components/kinectViewer/build/CMakeLists.txt 2013-03-06 15:30:36 UTC (rev 879)
@@ -69,6 +69,7 @@
#include(${DEPS_DIR}/xerces/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/opengl/CMakeLists.txt)
# START RECURSIVE
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
Modified: trunk/src/components/wiimoteClient/build/CMakeLists.txt
===================================================================
--- trunk/src/components/wiimoteClient/build/CMakeLists.txt 2013-03-05 17:25:06 UTC (rev 878)
+++ trunk/src/components/wiimoteClient/build/CMakeLists.txt 2013-03-06 15:30:36 UTC (rev 879)
@@ -71,6 +71,7 @@
# FIND AND CHECK OTHER DEPENDENCES
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
+include(${DEPS_DIR}/opengl/CMakeLists.txt)
# START RECURSIVE
More information about the Jderobot-admin
mailing list