Skip to content

Commit d9f4b4e

Browse files
committed
[CMake] Fix a dependency that was ignored.
The intention of the __allBuiltins was to build buildins as part of moving headers. However, CMake ignores a target dependency if it's not added with add_dependencies().
1 parent a9768d9 commit d9f4b4e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,13 @@ ROOT_ADD_TEST_SUBDIRECTORY(tutorials)
384384
ROOT_CREATE_HEADER_COPY_TARGETS()
385385

386386
get_property(__allHeaders GLOBAL PROPERTY ROOT_HEADER_TARGETS)
387+
add_custom_target(move_headers DEPENDS ${__allHeaders} gitinfotxt)
388+
387389
get_property(__allBuiltins GLOBAL PROPERTY ROOT_BUILTIN_TARGETS)
388-
add_custom_target(move_headers ALL DEPENDS ${__allHeaders} ${__allBuiltins} gitinfotxt)
390+
list(LENGTH __allBuiltins num_builtins)
391+
if(${num_builtins} GREATER 0)
392+
add_dependencies(move_headers ${__allBuiltins})
393+
endif()
389394

390395
#---CXX MODULES-----------------------------------------------------------------------------------
391396
if(MSVC)

0 commit comments

Comments
 (0)