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.

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

CMake: Ensure proper tls flag for Geant4 build, added option to override #424

Merged
merged 1 commit into from Aug 6, 2018

Conversation

Projects
None yet
2 participants
@andresailer
Member

andresailer commented Jul 31, 2018

BEGINRELEASENOTES

  • CMake: Ensure proper tls flag (global-dynamic) for Geant4 build, added option DD4HEP_IGNORE_GEANT4_TLS to override the check. Closes #419

ENDRELEASENOTES

@@ -97,6 +98,11 @@ add_definitions( -DBOOST_SPIRIT_USE_PHOENIX_V3 )
if(DD4HEP_USE_GEANT4)
find_package( Geant4 10.2.2 REQUIRED gdml ui_all vis_all )
include( ${Geant4_USE_FILE} )
IF((NOT ${Geant4_TLS_MODEL} STREQUAL "global-dynamic") AND NOT ${DD4HEP_IGNORE_GEANT4_TLS})
MESSAGE(FATAL_ERROR "Geant4 was built with ${Geant4_TLS_MODEL}, we need 'global-dynamic'! Ignore this ERROR with DD4HEP_IGNORE_GEANT4_TLS=True ")

This comment has been minimized.

@petricm

petricm Jul 31, 2018

Member

we need -> DD4hep requires

@andresailer andresailer force-pushed the andresailer:cmakeCheckTLS branch from ed2a064 to bd54216 Aug 1, 2018

@petricm petricm added the enhancement label Aug 6, 2018

@petricm petricm merged commit 5d93a28 into AIDASoft:master Aug 6, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment