From 2660db7faf8f9736f871b581253d6ab8570c0f7c Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Thu, 1 Aug 2013 07:42:37 +0200 Subject: [PATCH] Build unit tests with 'make' if unit testing is enabled --- tests/unit/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 4ccd4d8234b..d6366b3fce6 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -9,12 +9,12 @@ set_target_properties(gtest PROPERTIES COMPILE_DEFINITIONS "${DEFINES}") FILE(GLOB_RECURSE UNITTEST_SRC *_unittest.cc) -ADD_EXECUTABLE(shogun-unit-test EXCLUDE_FROM_ALL ${UNITTEST_SRC}) +ADD_EXECUTABLE(shogun-unit-test ${UNITTEST_SRC}) target_link_libraries(shogun-unit-test shogun gmock gtest) set_target_properties(shogun-unit-test PROPERTIES COMPILE_DEFINITIONS "${DEFINES}") ADD_CUSTOM_TARGET(unit-tests - COMMAND ./shogun-unit-test + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/shogun-unit-test DEPENDS shogun-unit-test) -add_test(unit-tests shogun-unit-test) +add_test(unit-test shogun-unit-test)