Commit 7697bebfc9f551cf9e80a74305cd65ea0e9ae03f
1 parent
ad1463a8
Move ENABLE_CLOSED_TESTS, remove unnecessary variable and conditional
Showing
2 changed files
with
2 additions
and
8 deletions
CMakeLists.txt
| ... | ... | @@ -144,12 +144,8 @@ set(BR_THIRDPARTY_APPS_DIR CACHE PATH "") |
| 144 | 144 | mark_as_advanced(BR_THIRDPARTY_PLUGINS_DIR) |
| 145 | 145 | mark_as_advanced(BR_THIRDPARTY_APPS_DIR) |
| 146 | 146 | set(CLOSEDBR_DIR $ENV{CLOSEDBR}) |
| 147 | -option(ENABLE_CLOSED_TESTS "Should the closedbr tests be built" OFF) | |
| 148 | 147 | if(EXISTS "${CLOSEDBR_DIR}/") |
| 149 | - set(BR_CLOSED_TESTING_DIR "${CLOSEDBR_DIR}/test") | |
| 150 | - if(ENABLE_CLOSED_TESTS) | |
| 151 | - include("${BR_CLOSED_TESTING_DIR}/closedtests.cmake") | |
| 152 | - endif(ENABLE_CLOSED_TESTS) | |
| 148 | + include("${CLOSEDBR_DIR}/test/closedtests.cmake") | |
| 153 | 149 | set(BR_THIRDPARTY_PLUGINS_DIR ${BR_THIRDPARTY_PLUGINS_DIR} "${CLOSEDBR_DIR}/plugins") |
| 154 | 150 | set(BR_THIRDPARTY_APPS_DIR ${BR_THIRDPARTY_APPS_DIR} "${CLOSEDBR_DIR}/app") |
| 155 | 151 | install(DIRECTORY ${CLOSEDBR_DIR}/share DESTINATION .) | ... | ... |
app/br/CMakeLists.txt
| ... | ... | @@ -7,7 +7,5 @@ target_link_libraries(br openbr ${CMAKE_THREAD_LIBS_INIT}) |
| 7 | 7 | qt5_use_modules(br ${QT_DEPENDENCIES}) |
| 8 | 8 | |
| 9 | 9 | install(TARGETS br RUNTIME DESTINATION bin) |
| 10 | +add_test(NAME br_initialize WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br) | |
| 10 | 11 | |
| 11 | -if(BUILD_TESTING) | |
| 12 | - add_test(NAME br_initialize WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br) | |
| 13 | -endif(BUILD_TESTING) | ... | ... |