File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed
Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -369,7 +369,7 @@ ExternalProject_Add(geant4
369369)
370370
371371list (APPEND packages root)
372- set (root_version "6.30.08 " )
372+ set (root_version "6.34.04 " )
373373string (REPLACE "\. " "-" root_version_gittag ${root_version} )
374374if (APPLE AND CMAKE_VERSION VERSION_GREATER 3.15)
375375 set (root_builtin_glew "-Dbuiltin_glew=ON" )
@@ -381,7 +381,7 @@ else()
381381 unset (root_cocoa)
382382 set (root_x11 ON )
383383endif ()
384- find_package (nlohmann_json 3.9)
384+ find_package (nlohmann_json 3.9 QUIET )
385385if (nlohmann_json_FOUND)
386386 set (root_builtin_nlohmannjson "-Dbuiltin_nlohmannjson=OFF" )
387387else ()
@@ -403,7 +403,6 @@ ExternalProject_Add(root
403403 "-Dgnuinstall=ON"
404404 "-Dhttp=ON"
405405 "-Dmathmore=ON"
406- "-Dminuit2=ON"
407406 "-Dmlp=ON"
408407 "-Dpyroot=ON"
409408 "-Dpythia8=ON"
@@ -417,6 +416,7 @@ ExternalProject_Add(root
417416 "-Dtmva=ON"
418417 "-Dvc=ON"
419418 "-Dvdt=OFF"
419+ "-Dvecgeom=ON"
420420 "-Dxml=ON"
421421 "-Dxrootd=ON"
422422 "-Dx11=${root_x11} "
@@ -427,8 +427,7 @@ ExternalProject_Add(root
427427 ${root_cocoa}
428428 UPDATE_DISCONNECTED ON
429429 PATCH_COMMAND ${patch} -p1 -i "${CMAKE_SOURCE_DIR} /legacy/root/fix_macos_sdk_mismatch.patch"
430- COMMAND ${patch} -p1 -i "${CMAKE_SOURCE_DIR} /legacy/root/fix_macosx_findOpenGL.patch"
431- DEPENDS pythia6 pythia8 vc ${extract_source_cache_target}
430+ DEPENDS pythia8 vc vecgeom ${extract_source_cache_target}
432431 ${LOG_TO_FILE}
433432)
434433
You can’t perform that action at this time.
0 commit comments