Commit cb89d81b9ae110b50ec4dc361957ecaecd2e1aca
1 parent
d8714721
Add cvmatio library as optional 3rd party lib
Showing
3 changed files
with
22 additions
and
0 deletions
.gitignore
CMakeLists.txt
| @@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8.9) | @@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8.9) | ||
| 4 | # Global settings | 4 | # Global settings |
| 5 | set(BR_SHARE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/share/openbr") | 5 | set(BR_SHARE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/share/openbr") |
| 6 | set(BR_SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts") | 6 | set(BR_SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts") |
| 7 | +set(BR_THIRDPARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty") | ||
| 7 | set(CMAKE_AUTOMOC ON) | 8 | set(CMAKE_AUTOMOC ON) |
| 8 | set(CPACK_PACKAGE_NAME "OpenBR") | 9 | set(CPACK_PACKAGE_NAME "OpenBR") |
| 9 | set(CPACK_PACKAGE_VENDOR "OpenBiometrics") | 10 | set(CPACK_PACKAGE_VENDOR "OpenBiometrics") |
| @@ -90,6 +91,13 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OpenCV_LIBS}) | @@ -90,6 +91,13 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OpenCV_LIBS}) | ||
| 90 | # Find Alphanum | 91 | # Find Alphanum |
| 91 | find_package(Alphanum REQUIRED) | 92 | find_package(Alphanum REQUIRED) |
| 92 | 93 | ||
| 94 | +# Find cvmatio (if using it) | ||
| 95 | +set(BR_WITH_CVMATIO OFF CACHE BOOL "Build with cvmatio library to read Matlab data files (required to use Caltech Pedestrians dataset)") | ||
| 96 | +if(${BR_WITH_CVMATIO}) | ||
| 97 | + find_package(cvmatio REQUIRED) | ||
| 98 | + add_definitions(-DCVMATIO) | ||
| 99 | +endif() | ||
| 100 | + | ||
| 93 | # Compiler flags | 101 | # Compiler flags |
| 94 | if(UNIX) | 102 | if(UNIX) |
| 95 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-strict-overflow -fvisibility=hidden -fno-omit-frame-pointer") | 103 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-strict-overflow -fvisibility=hidden -fno-omit-frame-pointer") |
share/openbr/cmake/Findcvmatio.cmake
0 → 100644
| 1 | +set(CVMATIO_DIR "${BR_THIRDPARTY_DIR}/cvmatio") | ||
| 2 | +if(NOT EXISTS ${CVMATIO_DIR}) | ||
| 3 | + # download source from github | ||
| 4 | + execute_process(COMMAND "git" "clone" "https://github.com/hbristow/cvmatio.git" WORKING_DIRECTORY ${BR_THIRDPARTY_DIR}) | ||
| 5 | +else() | ||
| 6 | + # update the source | ||
| 7 | + execute_process(COMMAND "git" "pull" WORKING_DIRECTORY ${CVMATIO_DIR}) | ||
| 8 | +endif() | ||
| 9 | +add_subdirectory(${CVMATIO_DIR}) | ||
| 10 | +include_directories(${CVMATIO_DIR}/include) | ||
| 11 | +set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${CVMATIO_DIR}/src/MatlabIO.cpp) | ||
| 12 | +link_directories(${CMAKE_BINARY_DIR}/3rdparty/cvmatio/src) | ||
| 13 | +set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} cvmatio) |