Skip to content

Commit 997871c

Browse files
committed
[CMakeLists.txt] Added option to disable building tests.
1 parent bf793e9 commit 997871c

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ addons:
2323
- libxi-dev
2424
- g++-8
2525
- cmake
26+
- cxxtest
2627

2728
script:
2829
- mkdir build
2930
- cd build
3031
- cmake ..
3132
- make -j8
33+
- ./openminer_tests
3234

3335
notifications:
3436
email: false

CMakeLists.txt

+18-14
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ endif ()
1515

1616
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
1717

18+
set(OM_BUILD_TESTS ON CACHE BOOL "Enable building tests if CxxTest is available")
19+
1820
include_directories(external)
1921

2022
#------------------------------------------------------------------------------
@@ -131,22 +133,24 @@ add_subdirectory(source/client)
131133
#------------------------------------------------------------------------------
132134
# Unit testing
133135
#------------------------------------------------------------------------------
134-
find_package(CxxTest QUIET)
136+
if(OM_BUILD_TESTS)
137+
find_package(CxxTest QUIET)
135138

136-
if(CXXTEST_FOUND)
137-
include_directories(${CXXTEST_INCLUDE_DIRS})
138-
enable_testing()
139+
if(CXXTEST_FOUND)
140+
include_directories(${CXXTEST_INCLUDE_DIRS})
141+
enable_testing()
139142

140-
file(GLOB_RECURSE HEADER_FILES source/*.hpp)
141-
foreach(HEADER_FILE ${HEADER_FILES})
142-
get_filename_component(HEADER_DIRECTORY ${HEADER_FILE} DIRECTORY)
143-
include_directories(${HEADER_DIRECTORY})
144-
endforeach(HEADER_FILE)
143+
file(GLOB_RECURSE HEADER_FILES source/*.hpp)
144+
foreach(HEADER_FILE ${HEADER_FILES})
145+
get_filename_component(HEADER_DIRECTORY ${HEADER_FILE} DIRECTORY)
146+
include_directories(${HEADER_DIRECTORY})
147+
endforeach(HEADER_FILE)
145148

146-
file(GLOB_RECURSE TEST_FILES tests/*.hpp)
147-
CXXTEST_ADD_TEST(${CMAKE_PROJECT_NAME}_tests unit-test.cpp ${TEST_FILES})
148-
target_link_libraries(${CMAKE_PROJECT_NAME}_tests ${CMAKE_PROJECT_NAME}_common ${CMAKE_PROJECT_NAME}_server_lib)
149-
else()
150-
message(WARNING "CxxTest not found!")
149+
file(GLOB_RECURSE TEST_FILES tests/*.hpp)
150+
CXXTEST_ADD_TEST(${CMAKE_PROJECT_NAME}_tests unit-test.cpp ${TEST_FILES})
151+
target_link_libraries(${CMAKE_PROJECT_NAME}_tests ${CMAKE_PROJECT_NAME}_common ${CMAKE_PROJECT_NAME}_server_lib)
152+
else()
153+
message(WARNING "CxxTest not found!")
154+
endif()
151155
endif()
152156

0 commit comments

Comments
 (0)