Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: phil333/face_detection
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ROBOTIS-GIT/face_detection
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 6 commits
  • 16 files changed
  • 3 contributors

Commits on Jul 19, 2017

  1. Update CMakeLists.txt

    "face_detection_cuda" removed.
    ROBOTIS-zerom authored Jul 19, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d86383c View commit details
  2. Update face_tracking.cpp

    gFps init bug fixed.
    ROBOTIS-zerom authored Jul 19, 2017
    Copy the full SHA
    06e07c8 View commit details

Commits on Mar 2, 2018

  1. Create .travis.yml

    robotpilot authored Mar 2, 2018
    Copy the full SHA
    02dc778 View commit details

Commits on Mar 8, 2018

  1. added a function of command.

    kaym9n committed Mar 8, 2018
    Copy the full SHA
    8b4cb21 View commit details
  2. Merge pull request #1 from ROBOTIS-GIT/develop

    added a function of command.
    kaym9n authored Mar 8, 2018
    Copy the full SHA
    ca48805 View commit details

Commits on Mar 16, 2018

  1. Update .travis.yml

    robotpilot authored Mar 16, 2018
    Copy the full SHA
    2a908e1 View commit details
32 changes: 32 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst

sudo: required
dist: trusty
services:
- docker
language: generic
python:
- "2.7"
compiler:
- gcc
notifications:
email:
on_success: always
on_failure: always
recipients:
- pyo@robotis.com
env:
matrix:
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian
# - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie
branches:
only:
- master
- develop
- kinetic-devel
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
script:
- source .ci_config/travis.sh

15 changes: 10 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@ find_package(catkin REQUIRED COMPONENTS
dynamic_reconfigure
)

find_package(OpenCV REQUIRED)

## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -o0")
@@ -141,7 +143,7 @@ include_directories(
# add_executable(face_detection_node src/face_detection_node.cpp)
add_executable(face_detection src/face_detection.cpp)

add_executable(face_detection_cuda src/face_detection_cuda.cpp)
#add_executable(face_detection_cuda src/face_detection_cuda.cpp)
add_executable(face_tracking src/face_tracking.cpp)
#add_executable(face_tracking_cuda src/face_tracking_cuda.cpp)
add_executable(face_listener src/face_listener.cpp)
@@ -152,7 +154,7 @@ add_executable(face_listener src/face_listener.cpp)
add_dependencies(face_detection ${PROJECT_NAME}_gencfg)
add_dependencies(face_tracking ${PROJECT_NAME}_gencfg)
# add_dependencies(face_detection_node face_detection_generate_messages_cpp)
add_dependencies(face_detection_cuda ${PROJECT_NAME}_gencfg)
#add_dependencies(face_detection_cuda ${PROJECT_NAME}_gencfg)
#add_dependencies(face_tracking_cuda ${PROJECT_NAME}_gencfg)


@@ -162,18 +164,21 @@ add_dependencies(face_detection_cuda ${PROJECT_NAME}_gencfg)
# )
target_link_libraries(face_detection
${catkin_LIBRARIES}
${OpenCV_LIBS}
)
target_link_libraries(face_detection_cuda
${catkin_LIBRARIES}
)
#target_link_libraries(face_detection_cuda
# ${catkin_LIBRARIES}
#)
target_link_libraries(face_tracking
${catkin_LIBRARIES}
${OpenCV_LIBS}
)
#target_link_libraries(face_tracking_cuda
# ${catkin_LIBRARIES}
#)
target_link_libraries(face_listener
${catkin_LIBRARIES}
${OpenCV_LIBS}
)


Loading