Skip to content

Add support for Unity builds #219

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
tmadlener merged 1 commit into from
Feb 11, 2026
Merged

Add support for Unity builds #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,15 @@ IF( NOT SIO_FOUND )

FetchContent_MakeAvailable(sio_extern)

# Unity builds break the bundled zlib used by SIO because several of zlib's
# internal headers are intentionally unguarded and assume a single translation
# unit per source file.
foreach(_lcio_no_unity_tgt IN ITEMS ZLIB zlib zlibstatic zlibshared)
if(TARGET ${_lcio_no_unity_tgt})
set_property(TARGET ${_lcio_no_unity_tgt} PROPERTY UNITY_BUILD OFF)
endif()
endforeach()
Comment thread
jmcarcell marked this conversation as resolved.

get_target_property(SIO_VERSION SIO::sio VERSION)
get_target_property(SIO_INCLUDE_DIRS SIO::sio INCLUDE_DIRECTORIES)
ENDIF()
Expand Down
3 changes: 3 additions & 0 deletions src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@ IF( BUILD_ROOTDICT )
INCLUDE_DIRECTORIES( SYSTEM "${ROOT_INCLUDE_DIRS}" )

ADD_SHARED_LIBRARY( lcioDict ${lcio_rootdict_sources} )
# ROOT dictionaries generate multiple translation units with many identical
# helper symbol names
set_property(TARGET lcioDict PROPERTY UNITY_BUILD OFF)
TARGET_LINK_LIBRARIES( lcioDict ${ROOT_LIBRARIES} LCIO::lcio SIO::sio)

IF( APPLE )
Expand Down
6 changes: 3 additions & 3 deletions src/cpp/include/UTIL/LCStdHepRdrNew.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef UTIL_LCStdHepRdr_H
#define UTIL_LCStdHepRdr_H 1
#ifndef UTIL_LCStdHepRdrNew_H
#define UTIL_LCStdHepRdrNew_H 1

#include "IMPL/LCCollectionVec.h"
#include "UTIL/lStdHep.hh"
Expand Down Expand Up @@ -89,4 +89,4 @@ namespace UTIL{

} // namespace UTIL

#endif /* ifndef UTIL_LCStdHepRdr_H */
#endif /* ifndef UTIL_LCStdHepRdrNew_H */