Use CMake Usage Requirements for podio targets #54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When building podio, use target_include_directories to set its build and install time header paths. Use of include_directories is retained in scripts due to ROOT's dictionary generation not supporting usage requirements until version 6.18. Update podioConfig to use full CMakePackageConfigHelpers system: - Automatic self-location - No hard coded install time paths - Re-find ROOT dependency - Proper imported target for libpodio These mean that a podio client can, in CMake, do ```cmake find_package(podio REQUIRED) add_executable(foo foo.cc) target_link_libraries(foo podio::podio) ``` and all include/link paths will be set correctly.
vvolkl
approved these changes
Sep 25, 2019
| INCLUDE( FindPackageHandleStandardArgs ) | ||
| FIND_PACKAGE_HANDLE_STANDARD_ARGS( podio DEFAULT_MSG podio_LIBRARY_DIR podio_INCLUDE_DIRS podio_LIBRARIES ) | ||
|
|
||
| ADD_LIBRARY(examplelibrary SHARED IMPORTED) |
There was a problem hiding this comment.
Excellent, this line (left over from boilerplate) forced us to use a custom FindPodio script, great that this is gone.
|
Thanks @vvolkl ! I've just realised I left a debug |
Remove extraneous debugging message() call. Set additional interface include directories for podio imported target with set_property per CMake recommendations.
|
Looks good to me - will merge. |
This was referenced Sep 26, 2019
drbenmorgan
added a commit
to drbenmorgan/podio
that referenced
this pull request
Sep 27, 2019
The changes introduced by AIDASoft#54 caused installs to fail due to the change in location of the templates directory relative to python/. Following discussion in AIDASoft#58, implement simplest possible change to fix by moving templates inside the python directory. Retain this layout at install time, adjusting the `template_dir` variable in podio_class_generator.py accordingly. Fixes: AIDASoft#58
gaede
pushed a commit
that referenced
this pull request
Sep 27, 2019
The changes introduced by #54 caused installs to fail due to the change in location of the templates directory relative to python/. Following discussion in #58, implement simplest possible change to fix by moving templates inside the python directory. Retain this layout at install time, adjusting the `template_dir` variable in podio_class_generator.py accordingly. Fixes: #58
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces the horribly out of date #29. key4hep/EDM4hep#1 identified a few issues in the way Podio is built and creates its CMake config files for downstream clients. This PR aims to address some of these by:
podioConfig.cmakefile and associatedpodioTargets.cmakeThese mean that a podio client can, in CMake, do
and all include/link paths will be set correctly.
I wasn't sure how to address install of the Python code as this appears split between program and library code (e.g.
podio_class_generator.pyshould probably go in theCMAKE_INSTALL_BINDIRlocation, whereaspodio_config_reader.pyis more a Python module). Part of this would be to allowpodio_class_generator.pyto be supplied as a CMake imported target together with a CMake function to run code generation, but see the info in #29 on issues here.BEGINRELEASENOTES
podioConfig.cmakefile and associatedpodioTargets.cmakeA podio client can, in CMake, do
and all include/link paths will be set correctly.
ENDRELEASENOTES