Skip to content

Commit 25f655e

Browse files
committed
Fix inclusion of test into CTest
1 parent fdf77fd commit 25f655e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ if(ENABLE_COVERAGE)
4444
endif()
4545
endif()
4646

47+
include(CTest)
48+
4749
add_subdirectory(lib)
4850

4951
add_subdirectory(src)
5052

51-
include(CTest)
5253
if(BUILD_TESTING)
54+
enable_testing()
5355
add_subdirectory(tests)
5456
endif()

lib/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(CTest)
2-
31
if(BUILD_TESTING AND NOT TARGET gtest)
42
add_subdirectory(googletest)
53
endif()

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
44
# otherwise if you try to run CTest the tests aren't build and CTest can't find them
55
if(NOT COMMAND ld_add_test)
66
function(ld_add_test TARGET_NAME)
7-
get_target_property(${TARGET_NAME}_EFA ${TARGET_NAME} EXCLUDE_FROM_ALL)
7+
get_target_property(${TARGET_NAME}_EXCLUDE_FROM_ALL ${TARGET_NAME} EXCLUDE_FROM_ALL)
88
if(NOT ${${TARGET_NAME}_EXCLUDE_FROM_ALL})
99
message(STATUS "[${PROJECT_NAME}] Adding test ${TARGET_NAME}")
1010
add_test(${TARGET_NAME} ${TARGET_NAME})

0 commit comments

Comments
 (0)