Skip to content

Commit 25c0b0a

Browse files
committed
Improve detection of excluded test targets
1 parent 9e24878 commit 25c0b0a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ set(TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
55
if(NOT COMMAND ld_add_test)
66
function(ld_add_test TARGET_NAME)
77
get_target_property(${TARGET_NAME}_EXCLUDE_FROM_ALL ${TARGET_NAME} EXCLUDE_FROM_ALL)
8-
if(NOT ${${TARGET_NAME}_EXCLUDE_FROM_ALL})
8+
get_directory_property(PROJECT_EXCLUDE_FROM_ALL DIRECTORY ${PROJECT_SOURCE_DIR} EXCLUDE_FROM_ALL)
9+
10+
if(NOT ${TARGET_NAME}_EXCLUDE_FROM_ALL AND NOT PROJECT_EXCLUDE_FROM_ALL)
911
message(STATUS "[${PROJECT_NAME}] Adding test ${TARGET_NAME}")
1012

1113
# https://stackoverflow.com/a/35697020

0 commit comments

Comments
 (0)