Skip to content

Commit

Permalink
Reorder relative path expansion to resolve dictionary checking issues
Browse files Browse the repository at this point in the history
  • Loading branch information
greenc-FNAL committed Apr 16, 2024
1 parent 7fecb4f commit 28d0573
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Modules/BuildDictionary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ function(build_dictionary)
else()
set(BD_SOURCES_H)
endif()
foreach(item IN ITEMS BD_CLASSES_H BD_CLASSES_DEF_XML linkdef_h_files)
if (${item})
cmake_path(ABSOLUTE_PATH ${item})
endif()
endforeach()
if (BD_LIB_TARGET_VAR)
set(${BD_LIB_TARGET_VAR} ${BD_LIB_TARGET} PARENT_SCOPE)
endif()
Expand Down Expand Up @@ -417,11 +422,6 @@ function(_generate_dictionary)
foreach(item IN LISTS BD_CLASSES_H BD_SOURCES_H)
list(APPEND implicit_depends CXX ${item})
endforeach()
foreach(item IN ITEMS BD_CLASSES_H BD_CLASSES_DEF_XML linkdef_h_files)
if (${item})
cmake_path(ABSOLUTE_PATH ${item})
endif()
endforeach()
add_custom_command(
# See https://gitlab.kitware.com/cmake/cmake/-/issues/21364#note_849331
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BD_GENERATED_SOURCE_FILENAME} # ${AUX_OUTPUT}
Expand Down

0 comments on commit 28d0573

Please sign in to comment.