Move ENABLE_CLOSED_TESTS, remove unnecessary variable and conditional

Ben Klein
1 parent ad1463a8
Showing 2 changed files with 2 additions and 8 deletions
CMakeLists.txt
app/br/CMakeLists.txt
@@ -144,12 +144,8 @@ set(BR_THIRDPARTY_APPS_DIR CACHE PATH &quot;&quot;)
 mark_as_advanced(BR_THIRDPARTY_PLUGINS_DIR)
 mark_as_advanced(BR_THIRDPARTY_APPS_DIR)
 set(CLOSEDBR_DIR $ENV{CLOSEDBR})
-option(ENABLE_CLOSED_TESTS "Should the closedbr tests be built" OFF)
 if(EXISTS "${CLOSEDBR_DIR}/")
-  set(BR_CLOSED_TESTING_DIR "${CLOSEDBR_DIR}/test")
-  if(ENABLE_CLOSED_TESTS)
-    include("${BR_CLOSED_TESTING_DIR}/closedtests.cmake")
-  endif(ENABLE_CLOSED_TESTS)
+  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 .)
@@ -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)
-if(BUILD_TESTING)
-  add_test(NAME br_initialize WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br)
-endif(BUILD_TESTING)