From 7697bebfc9f551cf9e80a74305cd65ea0e9ae03f Mon Sep 17 00:00:00 2001 From: Ben Klein Date: Wed, 5 Nov 2014 14:09:37 -0500 Subject: [PATCH] Move ENABLE_CLOSED_TESTS, remove unnecessary variable and conditional --- CMakeLists.txt | 6 +----- app/br/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ea921a..55aea05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,12 +144,8 @@ set(BR_THIRDPARTY_APPS_DIR CACHE PATH "") 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 .) diff --git a/app/br/CMakeLists.txt b/app/br/CMakeLists.txt index fa08f38..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) -if(BUILD_TESTING) - add_test(NAME br_initialize WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND br) -endif(BUILD_TESTING) -- libgit2 0.21.4