You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/CxxBuild.jl
+9-9Lines changed: 9 additions & 9 deletions
Original file line number
Diff line number
Diff line change
@@ -131,7 +131,7 @@ function build_root_wrapper(rootsys = ROOTprefs.get_ROOTSYS())
131
131
end
132
132
133
133
#Clean-up build area
134
-
ifis_clean_after_build_enabled()
134
+
ifget_clean_after_build()
135
135
try
136
136
splitpath(buildpath)[end-1] !="build"||error("Bug foud. buildpath must end with /build") #protect against wrong directory deletion after introduction of a bug
137
137
rm(buildpath, recursive=true, force=true)
@@ -187,7 +187,7 @@ function check_rootsys()
187
187
188
188
i =findfirst(rootconfig->get_vers(rootconfig) ∈ supported_root_versions, binpaths)
189
189
190
-
if ( isnothing(i) &&!ROOTprefs.is_root_version_checked()
190
+
if ( isnothing(i) &&!ROOTprefs.get_check_root_version()
@info"The plaform supports ROOT_jll. You can use ROOT libraries from the ROOT_jll package to skip the long compilation step. To switch to ROOT_jll, interrupt the import, run 'using ROOTprefs; use_root_jll!() to enable the ROOT_jll mode, restart Julia, and execute 'import ROOT' again."
219
+
if!get_use_root_jll() &&is_jll_supported()
220
+
@info"The plaform supports ROOT_jll. You can use ROOT libraries from the ROOT_jll package to skip the long compilation step. To switch to ROOT_jll, interrupt the import, run 'using ROOTprefs; set_use_root_jll() to enable the ROOT_jll mode, restart Julia, and execute 'import ROOT' again."
221
221
end
222
222
223
223
#Below, we process differently if root_jll mode is enabled or not
224
224
#in order to adapt the error message.
225
-
rootsys, pref_rootsys =ifis_root_jll_used() #jll mode but platform not supported.
226
-
use_root_jll!(false, nowarn =true)
225
+
rootsys, pref_rootsys =ifget_use_root_jll() #jll mode but platform not supported.
226
+
set_use_root_jll(false, nowarn =true)
227
227
intro ="Platform not supported by the prebuilt wrapper ROOT_julia_jll package."
228
-
postface ="The mode 'use_root_jll' has been disabled (can be reenabled by executing `using ROOTprefs; use_root_jll!()`)."
228
+
postface ="The mode 'use_root_jll' has been disabled (can be reenabled by executing `using ROOTprefs; set_use_root_jll()`)."
229
229
try
230
230
@warn("$intro$postface")
231
231
rootsys, pref_rootsys =check_rootsys()
@@ -250,7 +250,7 @@ function get_or_build_libroot_julia()
250
250
251
251
if!isempty(libpath) && rootsys != pref_rootsys
252
252
#If build succeeded and ROOTSYS was modified, update LocalPreference.toml
0 commit comments