diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4b7b10feb073fb69fa7f9a61609085e13b796c9..87e4d058e59e68b691a58ad525869d57a0f90d80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,18 +67,19 @@ ENDIF()
 cmake_host_system_information(RESULT HOST_RAM_MB QUERY TOTAL_PHYSICAL_MEMORY)
 math(EXPR DD4HEP_HIGH_MEM_POOL_DEPTH "${HOST_RAM_MB} / 2000" OUTPUT_FORMAT DECIMAL)
 
-option(DD4HEP_USE_XERCESC "Enable 'Detector Builders' based on XercesC"   OFF)
-option(DD4HEP_USE_GEANT4  "Enable the simulation part based on Geant4"    OFF)
-option(DD4HEP_IGNORE_GEANT4_TLS "Ignore the tls flag Geant4 was compiled with" OFF)
-option(DD4HEP_USE_GEAR    "Build gear wrapper for backward compatibility" OFF)
-option(DD4HEP_USE_LCIO    "Build lcio extensions"                         OFF)
-option(DD4HEP_USE_EDM4HEP "Build edm4hep extensions"                      OFF)
-option(DD4HEP_USE_HEPMC3  "Build hepmc3 extensions"                       OFF)
-option(DD4HEP_USE_TBB     "Build features that require TBB"               OFF)
-option(DD4HEP_LOAD_ASSIMP "Download and build ASSIMP from github"         OFF)
-option(BUILD_TESTING      "Enable and build tests"                        ON)
-option(BUILD_SHARED_LIBS  "If OFF build STATIC Libraries"                 ON)
-option(DD4HEP_SET_RPATH   "Link libraries with built-in RPATH (run-time search path)" ON)
+option(DD4HEP_USE_XERCESC       "Enable 'Detector Builders' based on XercesC"   OFF)
+option(DD4HEP_USE_GEANT4        "Enable the simulation part based on Geant4"    OFF)
+option(DD4HEP_IGNORE_GEANT4_TLS "Ignore the tls flag Geant4 was compiled with"  OFF)
+option(DD4HEP_USE_GEAR          "Build gear wrapper for backward compatibility" OFF)
+option(DD4HEP_USE_LCIO          "Build lcio extensions"                         OFF)
+option(DD4HEP_USE_GEANT4_UNITS  "Build using Geant4 units throughout"           OFF)
+option(DD4HEP_USE_EDM4HEP       "Build edm4hep extensions"                      OFF)
+option(DD4HEP_USE_HEPMC3        "Build hepmc3 extensions"                       OFF)
+option(DD4HEP_USE_TBB           "Build features that require TBB"               OFF)
+option(DD4HEP_LOAD_ASSIMP       "Download and build ASSIMP from github"         OFF)
+option(BUILD_TESTING            "Enable and build tests"                        ON)
+option(BUILD_SHARED_LIBS        "If OFF build STATIC Libraries"                 ON)
+option(DD4HEP_SET_RPATH         "Link libraries with built-in RPATH (run-time search path)" ON)
 
 SET(DD4HEP_BUILD_PACKAGES "DDRec DDDetectors DDCond DDAlign DDCAD DDDigi DDG4 DDEve UtilityApps"
   CACHE STRING "List of DD4hep packages to build")