Skip to content

Fix for ROOT-8949 - cmake does not rebuild core dictionary when LinkDef1/2/3 changed #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peremato merged 2 commits into from
Aug 10, 2017
Merged

Fix for ROOT-8949 - cmake does not rebuild core dictionary when LinkDef1/2/3 changed #852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4437b0
Fix for ROOT-8949 - cmake does not rebuild core dictionary when LinkD…
peremato Aug 10, 2017
3b62fe3
Removed debug aids
peremato Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cmake/modules/RootNewMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,18 +380,20 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
endforeach()

#---call rootcint------------------------------------------
add_custom_command(OUTPUT ${dictionary}.cxx ${pcm_name} ${rootmap_name}
add_custom_command(OUTPUT ${dictionary}.stamp
BYPRODUCTS ${dictionary}.cxx ${pcm_name} ${rootmap_name}
COMMAND ${command} -v2 -f ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs}
${ARG_OPTIONS} ${definitions} ${includedirs} ${headerfiles} ${_linkdef}
COMMAND ${CMAKE_COMMAND} -E touch ${dictionary}.stamp
IMPLICIT_DEPENDS ${_implicitdeps}
DEPENDS ${_list_of_header_dependencies} ${_linkdef} ${ROOTCINTDEP} ${ARG_DEPENDENCIES})
get_filename_component(dictname ${dictionary} NAME)

#---roottest compability
if(ARG_NOINSTALL OR CMAKE_ROOTTEST_DICT OR (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY))
add_custom_target(${dictname} DEPENDS ${dictionary}.cxx)
add_custom_target(${dictname} DEPENDS ${dictionary}.stamp)
else()
add_custom_target(${dictname} DEPENDS ${dictionary}.cxx)
add_custom_target(${dictname} DEPENDS ${dictionary}.stamp)

set_property(GLOBAL APPEND PROPERTY ROOT_DICTIONARY_TARGETS ${dictname})
set_property(GLOBAL APPEND PROPERTY ROOT_DICTIONARY_FILES ${CMAKE_CURRENT_BINARY_DIR}/${dictionary}.cxx)
Expand Down Expand Up @@ -582,6 +584,7 @@ function(ROOT_LINKER_LIBRARY library)
endif()
if(TARGET G__${library})
add_dependencies(${library} G__${library})
message("${library} --> G__${library}")
Copy link
Member

@amadio amadio Aug 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Pere, maybe this line sneaked in?

Copy link
Contributor Author

@peremato peremato Aug 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well spotted! Thanks!

else()
# Uncomment to see if we maybe forgot to add a dependency between linking
# a dictionary and generating the G__*.cxx file. We can't have this by
Expand Down
3 changes: 3 additions & 0 deletions core/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ ROOT_GENERATE_DICTIONARY(G__Core
OPTIONS ${dict_opts}
LINKDEF LinkDef.h)

# This is needed becuase LinkDef.h includes other LinkDef starting from ${CMAKE_SOURCE_DIR}
set_property(TARGET G__Core PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR})

list(REMOVE_ITEM sources TROOT.cxx roota.cxx)
ROOT_OBJECT_LIBRARY(Base G__Core.cxx ${sources})

Expand Down