Skip to content

Commit f2a88e9

Browse files
committedNov 20, 2021
Improve detection of excluded test targets
1 parent 70e2547 commit f2a88e9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed
 

‎lib/linuxdeploy

‎tests/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
if(NOT COMMAND ld_add_test)
44
function(ld_add_test TARGET_NAME)
55
get_target_property(${TARGET_NAME}_EXCLUDE_FROM_ALL ${TARGET_NAME} EXCLUDE_FROM_ALL)
6-
if(NOT ${${TARGET_NAME}_EXCLUDE_FROM_ALL})
6+
get_directory_property(PROJECT_EXCLUDE_FROM_ALL DIRECTORY ${PROJECT_SOURCE_DIR} EXCLUDE_FROM_ALL)
7+
8+
if(NOT ${TARGET_NAME}_EXCLUDE_FROM_ALL AND NOT PROJECT_EXCLUDE_FROM_ALL)
79
message(STATUS "[${PROJECT_NAME}] Adding test ${TARGET_NAME}")
810

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

0 commit comments

Comments
 (0)
Please sign in to comment.