Commit d26ddbef authored by Aylen Ricca's avatar Aylen Ricca
Browse files

Merge remote-tracking branch 'origin/cmake_compile' into integ_visrob

parents e7b4109c 53238f1d
......@@ -14,6 +14,11 @@ add_subdirectory (src/Comunicacion)
add_subdirectory (src/Havimo)
add_subdirectory (src/DynamixelCustom)
add_subdirectory (src/Poses)
add_subdirectory (src/Utils)
add_subdirectory (src/Vision)
add_subdirectory (src/ZigbeeVisionFilter)
add_subdirectory (src/Zgb_console)
INCLUDE_DIRECTORIES(./include)
total 496
-rw-r--r-- 1 futbot13 futbot13 0 ago 10 22:01 files.txt
-rw-r--r-- 1 futbot13 futbot13 1768 ago 10 02:02 libConfiguracion.a
-rw-r--r-- 1 futbot13 futbot13 5474 jul 8 18:24 libcuello.a (nadie sabe de donde sale)
-rw-r--r-- 1 futbot13 futbot13 29286 jul 8 18:24 libdynamixel_custom.a
-rw-r--r-- 1 futbot13 futbot13 28100 jul 8 18:24 libhavimo.a
-rw-r--r-- 1 futbot13 futbot13 109416 jul 8 18:24 libpgvisrob.a
-rw-r--r-- 1 futbot13 futbot13 29128 jul 8 18:24 libpolarvision.a (no se de donde se saca)
-rw-r--r-- 1 futbot13 futbot13 85104 jul 8 18:24 libPoses.a
-rw-r--r-- 1 futbot13 futbot13 10356 jul 8 18:24 libutils.a
-rw-r--r-- 1 futbot13 futbot13 79298 jul 8 18:24 libvision.a
-rw-r--r-- 1 futbot13 futbot13 27588 jul 8 18:24 libvision_com.a (esta en src/comunicacion)
-rw-r--r-- 1 futbot13 futbot13 55638 jul 8 18:24 libvisionSoloBall.a (es un example)
-rw-r--r-- 1 futbot13 futbot13 10216 jul 8 18:24 libzgb_console.a
-rw-r--r-- 1 futbot13 futbot13 11084 jul 8 18:24 libzigbee_vision_filter.a
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(pruebas1)
INCLUDE(FindPkgConfig)
INCLUDE_DIRECTORIES(../../include)
file (GLOB pruebas1_SRC "*.h" "*.cpp")
find_package(OpenCV REQUIRED)
find_package(cvBlob REQUIRED)
include_directories(${OpenCV_INCLUDE_DIRS} ${cvBlob_INCLUDE_DIRS})
set(LIBS ${cvBlob_LIBS} ${OpenCV_LIBS})
link_directories(${OpenCV_INCLUDE_DIRS} ${cvBlob_INCLUDE_DIRS})
add_executable(pruebas1 functions.cpp prueba1.cpp )
target_link_libraries(pruebas1 ${LIBS})
\ No newline at end of file
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(libvision_com)
#set(HAVIMO "SI")
IF(CAMARA STREQUAL "hav")
MESSAGE("Se usara la interface A")
file (GLOB vision_com_SRC "functions.h" "algo1.c")
add_definitions(-DUSE_HAVIMO)
ELSEIF(CAMARA STREQUAL "web")
MESSAGE("Se usara la interface B")
file (GLOB vision_com_SRC "functions.h" "algo2.c")
add_definitions(-DUSE_WEB)
ELSE(CAMARA STREQUAL "")
MESSAGE("NO SE DEFINIO CAMARA")
ENDIF()
ADD_LIBRARY(vision_com STATIC ${vision_com_SRC})
ADD_EXECUTABLE(main "main.c")
TARGET_LINK_LIBRARIES(main vision_com)
#include <stdlib.h>
#include "functions.h"
void printAlgo(){
printf("ALGO 1\n");
}
\ No newline at end of file
#include <stdlib.h>
#include "functions.h"
void printAlgo(){
printf("ALGO 2\n");
}
\ No newline at end of file
#ifndef FUNCTIONS_H
#define FUNCTIONS_H
#ifdef USE_HAVIMO
#define PELOTA 6
#else
#ifdef USE_WEB
#define PELOTA 10
#else
#define PELOTA -1
#endif
#endif
void printAlgo();
#endif
\ No newline at end of file
#include "functions.h"
int main(int argc, char* argv[])
{
printAlgo();
printf("%d\n",(int) PELOTA );
}
\ No newline at end of file
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(libVision)
INCLUDE_DIRECTORIES(../../include)
file (GLOB Vision_SRC "*.h" "*.c")
ADD_LIBRARY(Vision STATIC ${Vision_SRC})
SET_PROPERTY(TARGET Vision PROPERTY SOVERSION 1.0)
INSTALL(TARGETS Vision DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
\ No newline at end of file
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(libvision)
INCLUDE_DIRECTORIES(../../include)
file (GLOB vision_SRC "*.h" "*.c")
ADD_LIBRARY(vision STATIC ${vision_SRC})
SET_PROPERTY(TARGET vision PROPERTY SOVERSION 1.0)
INSTALL(TARGETS vision DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
\ No newline at end of file
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(libzgb_console)
INCLUDE_DIRECTORIES(../../include)
file (GLOB libzgb_console_SRC "*.h" "*.c")
ADD_LIBRARY(zgb_console STATIC ${libzgb_console_SRC})
SET_PROPERTY(TARGET zgb_console PROPERTY SOVERSION 1.0)
INSTALL(TARGETS zgb_console DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
\ No newline at end of file
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(libzigbee_vision_filter)
INCLUDE_DIRECTORIES(../../include)
file (GLOB libzigbee_vision_filter_SRC "*.h" "*.c")
ADD_LIBRARY(zigbee_vision_filter STATIC ${libzigbee_vision_filter_SRC})
SET_PROPERTY(TARGET zigbee_vision_filter PROPERTY SOVERSION 1.0)
INSTALL(TARGETS zigbee_vision_filter DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment