Commit 9c387d94db7b847fb6abdcb0933314cf59b21977
1 parent
582a5454
Finished
Showing
4 changed files
with
6 additions
and
5 deletions
3rdparty/stasm4.0.0/stasm/CMakeLists.txt
| @@ -15,5 +15,5 @@ set_target_properties(stasm PROPERTIES | @@ -15,5 +15,5 @@ set_target_properties(stasm PROPERTIES | ||
| 15 | 15 | ||
| 16 | target_link_libraries(stasm ${OpenCV_LIBS} ${Qt5Core_QTMAIN_LIBRARIES}) | 16 | target_link_libraries(stasm ${OpenCV_LIBS} ${Qt5Core_QTMAIN_LIBRARIES}) |
| 17 | 17 | ||
| 18 | -install(DIRECTORY include DESTINATION include/stasm) | 18 | +install(DIRECTORY include/ DESTINATION include/stasm) |
| 19 | install(TARGETS stasm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) | 19 | install(TARGETS stasm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) |
openbr/plugins/stasm4.cmake
| @@ -14,5 +14,6 @@ if(${BR_WITH_STASM4}) | @@ -14,5 +14,6 @@ if(${BR_WITH_STASM4}) | ||
| 14 | install(FILES ${STASM4_LIBS} DESTINATION lib) | 14 | install(FILES ${STASM4_LIBS} DESTINATION lib) |
| 15 | endif() | 15 | endif() |
| 16 | 16 | ||
| 17 | + install(DIRECTORY ${STASM4_INCLUDE_DIR}/ DESTINATION include) | ||
| 17 | install(DIRECTORY ${STASM4_DATA_DIR} DESTINATION share/openbr/models/stasm) | 18 | install(DIRECTORY ${STASM4_DATA_DIR} DESTINATION share/openbr/models/stasm) |
| 18 | endif() | 19 | endif() |
openbr/plugins/stasm4.cpp
| 1 | -#include <stasm_lib.h> | ||
| 2 | -#include <stasmcascadeclassifier.h> | 1 | +#include <stasm/stasm_lib.h> |
| 2 | +#include <stasm/stasmcascadeclassifier.h> | ||
| 3 | #include <opencv2/opencv.hpp> | 3 | #include <opencv2/opencv.hpp> |
| 4 | #include <Eigen/Dense> | 4 | #include <Eigen/Dense> |
| 5 | #include "openbr_internal.h" | 5 | #include "openbr_internal.h" |
share/openbr/cmake/FindStasm4.cmake
| @@ -22,7 +22,7 @@ foreach(CACHE_VAR ${CACHE_VARS}) | @@ -22,7 +22,7 @@ foreach(CACHE_VAR ${CACHE_VARS}) | ||
| 22 | else() | 22 | else() |
| 23 | set(CACHE_VAR_TYPE :${CACHE_VAR_TYPE}) | 23 | set(CACHE_VAR_TYPE :${CACHE_VAR_TYPE}) |
| 24 | endif() | 24 | endif() |
| 25 | - set(CMAKE_ARGS "${CMAKE_ARGS} -D${CACHE_VAR}${CACHE_VAR_TYPE}=\"${${CACHE_VAR}}\"") | 25 | + list(APPEND CMAKE_ARGS "-D${CACHE_VAR}${CACHE_VAR_TYPE}=${${CACHE_VAR}}") |
| 26 | endif() | 26 | endif() |
| 27 | endforeach() | 27 | endforeach() |
| 28 | 28 | ||
| @@ -35,7 +35,7 @@ set(STASM4_INSTALL_DIR "${CMAKE_BINARY_DIR}/stasm") | @@ -35,7 +35,7 @@ set(STASM4_INSTALL_DIR "${CMAKE_BINARY_DIR}/stasm") | ||
| 35 | ExternalProject_Add(external_stasm | 35 | ExternalProject_Add(external_stasm |
| 36 | URL ${STASM4_SOURCE_DIR} | 36 | URL ${STASM4_SOURCE_DIR} |
| 37 | PREFIX ${STASM4_PREFIX} | 37 | PREFIX ${STASM4_PREFIX} |
| 38 | - CMAKE_ARGS \"${CMAKE_ARGS}\"; | 38 | + CMAKE_ARGS "${CMAKE_ARGS};-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" |
| 39 | INSTALL_DIR ${STASM4_INSTALL_DIR} | 39 | INSTALL_DIR ${STASM4_INSTALL_DIR} |
| 40 | BINARY_DIR "${STASM4_PREFIX}/lib" | 40 | BINARY_DIR "${STASM4_PREFIX}/lib" |
| 41 | ) | 41 | ) |