diff --git a/CMakeLists.txt b/CMakeLists.txt index 84116eb..55aea05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,8 +143,9 @@ set(BR_THIRDPARTY_PLUGINS_DIR CACHE PATH "") set(BR_THIRDPARTY_APPS_DIR CACHE PATH "") mark_as_advanced(BR_THIRDPARTY_PLUGINS_DIR) mark_as_advanced(BR_THIRDPARTY_APPS_DIR) -set(CLOSEDBR_DIR "${CMAKE_SOURCE_DIR}/../closedbr") -if(EXISTS "${CLOSEDBR_DIR}" AND IS_DIRECTORY "${CLOSEDBR_DIR}") +set(CLOSEDBR_DIR $ENV{CLOSEDBR}) +if(EXISTS "${CLOSEDBR_DIR}/") + include("${CLOSEDBR_DIR}/test/closedtests.cmake") set(BR_THIRDPARTY_PLUGINS_DIR ${BR_THIRDPARTY_PLUGINS_DIR} "${CLOSEDBR_DIR}/plugins") set(BR_THIRDPARTY_APPS_DIR ${BR_THIRDPARTY_APPS_DIR} "${CLOSEDBR_DIR}/app") install(DIRECTORY ${CLOSEDBR_DIR}/share DESTINATION .) diff --git a/app/br/CMakeLists.txt b/app/br/CMakeLists.txt index 398eb1d..d8c7192 100644 --- a/app/br/CMakeLists.txt +++ b/app/br/CMakeLists.txt @@ -7,7 +7,5 @@ target_link_libraries(br openbr ${CMAKE_THREAD_LIBS_INIT}) qt5_use_modules(br ${QT_DEPENDENCIES}) install(TARGETS br RUNTIME DESTINATION bin) - add_test(NAME br_initialize WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br) -add_test(NAME br_objects WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br -objects) -add_test(NAME br_draw_face_detection WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br -algorithm DrawFaceDetection -enroll ../data/family.jpg) + diff --git a/app/examples/CMakeLists.txt b/app/examples/CMakeLists.txt index 1685ae7..44df0da 100644 --- a/app/examples/CMakeLists.txt +++ b/app/examples/CMakeLists.txt @@ -5,5 +5,7 @@ foreach(EXAMPLE ${EXAMPLES}) qt5_use_modules(${EXAMPLE_BASENAME} ${QT_DEPENDENCIES}) target_link_libraries(${EXAMPLE_BASENAME} openbr ${BR_THIRDPARTY_LIBS}) install(TARGETS ${EXAMPLE_BASENAME} RUNTIME DESTINATION bin) - add_test(NAME ${EXAMPLE_BASENAME}_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${EXAMPLE_BASENAME}) + if(BUILD_TESTING) + add_test(NAME ${EXAMPLE_BASENAME}_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${EXAMPLE_BASENAME}) + endif(BUILD_TESTING) endforeach()