From cb89d81b9ae110b50ec4dc361957ecaecd2e1aca Mon Sep 17 00:00:00 2001 From: Austin Blanton Date: Wed, 5 Feb 2014 18:24:14 -0500 Subject: [PATCH] Add cvmatio library as optional 3rd party lib --- .gitignore | 1 + CMakeLists.txt | 8 ++++++++ share/openbr/cmake/Findcvmatio.cmake | 13 +++++++++++++ 3 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 share/openbr/cmake/Findcvmatio.cmake diff --git a/.gitignore b/.gitignore index c5934d2..8c7c3c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ ### Repository Specific ### 3rdparty/LatentSDK* 3rdparty/pittpatt* +3rdparty/cvmatio data/*/img data/*/vid data/PCSO/* diff --git a/CMakeLists.txt b/CMakeLists.txt index 039c678..6a0e440 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8.9) # Global settings set(BR_SHARE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/share/openbr") set(BR_SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts") +set(BR_THIRDPARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty") set(CMAKE_AUTOMOC ON) set(CPACK_PACKAGE_NAME "OpenBR") set(CPACK_PACKAGE_VENDOR "OpenBiometrics") @@ -90,6 +91,13 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OpenCV_LIBS}) # Find Alphanum find_package(Alphanum REQUIRED) +# Find cvmatio (if using it) +set(BR_WITH_CVMATIO OFF CACHE BOOL "Build with cvmatio library to read Matlab data files (required to use Caltech Pedestrians dataset)") +if(${BR_WITH_CVMATIO}) + find_package(cvmatio REQUIRED) + add_definitions(-DCVMATIO) +endif() + # Compiler flags if(UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-strict-overflow -fvisibility=hidden -fno-omit-frame-pointer") diff --git a/share/openbr/cmake/Findcvmatio.cmake b/share/openbr/cmake/Findcvmatio.cmake new file mode 100644 index 0000000..b5d11e1 --- /dev/null +++ b/share/openbr/cmake/Findcvmatio.cmake @@ -0,0 +1,13 @@ +set(CVMATIO_DIR "${BR_THIRDPARTY_DIR}/cvmatio") +if(NOT EXISTS ${CVMATIO_DIR}) + # download source from github + execute_process(COMMAND "git" "clone" "https://github.com/hbristow/cvmatio.git" WORKING_DIRECTORY ${BR_THIRDPARTY_DIR}) +else() + # update the source + execute_process(COMMAND "git" "pull" WORKING_DIRECTORY ${CVMATIO_DIR}) +endif() +add_subdirectory(${CVMATIO_DIR}) +include_directories(${CVMATIO_DIR}/include) +set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${CVMATIO_DIR}/src/MatlabIO.cpp) +link_directories(${CMAKE_BINARY_DIR}/3rdparty/cvmatio/src) +set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} cvmatio) -- libgit2 0.21.4