Skip to content

CMake integration with external projects #916

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
Teemperor merged 2 commits into from
Sep 4, 2017
Merged

CMake integration with external projects #916

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6102106
Support root installations in non-system dirs
dennisklein Aug 31, 2017
5f43efa
Support external consumption of ROOT_LINKER_LIBRARY
dennisklein Sep 1, 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
6 changes: 4 additions & 2 deletions cmake/modules/RootNewMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
set(command ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" "ROOTIGNOREPREFIX=1" $<TARGET_FILE:rootcling> -rootbuild)
set(ROOTCINTDEP rootcling)
elseif(TARGET ROOT::rootcling)
set(command ROOT::rootcling)
set(command ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${ROOT_LIBRARY_DIR}:$ENV{LD_LIBRARY_PATH}" $<TARGET_FILE:ROOT::rootcling>)
else()
set(command rootcling)
endif()
Expand Down Expand Up @@ -603,7 +603,9 @@ function(ROOT_LINKER_LIBRARY library)
# ROOT_GENERATE_DICTIONARY call that prevents this warning.
#message(AUTHOR_WARNING "Couldn't find target: " ${library} "\n Forgot to call ROOT_GENERATE_DICTIONARY?")
endif()
add_dependencies(${library} move_headers)
if(CMAKE_PROJECT_NAME STREQUAL ROOT)
add_dependencies(${library} move_headers)
endif()
set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS ${library})
set_target_properties(${library} PROPERTIES OUTPUT_NAME ${library_name})
set_target_properties(${library} PROPERTIES INTERFACE_LINK_LIBRARIES "${ARG_DEPENDENCIES}")
Expand Down