diff options
| author | vvolkl <valentin.volkl@cern.ch> | 2020-06-25 05:42:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 22:42:41 -0500 |
| commit | b8270559d95ec584054c310973e3311e8d0b071d (patch) | |
| tree | 160e28a65909417455fa55c6890a4a8843ffdf45 | |
| parent | fe14c201dc3fb28a22808747cfddc43b0eb3efae (diff) | |
| download | spack-b8270559d95ec584054c310973e3311e8d0b071d.tar.gz spack-b8270559d95ec584054c310973e3311e8d0b071d.tar.bz2 spack-b8270559d95ec584054c310973e3311e8d0b071d.tar.xz spack-b8270559d95ec584054c310973e3311e8d0b071d.zip | |
[podio] patch to correctly load dictionaries in v00-10 (#17157)
| -rw-r--r-- | var/spack/repos/builtin/packages/podio/dictloading.patch | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/podio/package.py | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/podio/dictloading.patch b/var/spack/repos/builtin/packages/podio/dictloading.patch new file mode 100644 index 0000000000..15ec301b13 --- /dev/null +++ b/var/spack/repos/builtin/packages/podio/dictloading.patch @@ -0,0 +1,20 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 120a899..05991f1 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -41,7 +41,7 @@ SET(headers + ${CMAKE_SOURCE_DIR}/include/podio/PythonEventStore.h + ) + PODIO_GENERATE_DICTIONARY(podioDict ${headers} SELECTION selection.xml +- OPTIONS --library ${CMAKE_SHARED_LIBRARY_PREFIX}podio${CMAKE_SHARED_LIBRARY_SUFFIX} ++ OPTIONS --library ${CMAKE_SHARED_LIBRARY_PREFIX}podioDict${CMAKE_SHARED_LIBRARY_SUFFIX} + ) + # prevent generating dictionary twice + set_target_properties(podioDict-dictgen PROPERTIES EXCLUDE_FROM_ALL TRUE) +@@ -58,5 +58,5 @@ install(TARGETS podio podioDict podioRootIO + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/podio DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/podioDictDict.rootmap +- ${CMAKE_CURRENT_BINARY_DIR}/libpodio_rdict.pcm ++ ${CMAKE_CURRENT_BINARY_DIR}/libpodioDict_rdict.pcm + DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index 488eaf54f1..7211cdf111 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -28,6 +28,7 @@ class Podio(CMakePackage): # cpack config throws an error on some systems patch('cpack.patch', when="@:0.10.0") + patch('dictloading.patch', when="@0.10.0") depends_on('root@6.08.06:') |