Skip to content

Commit 5e0a9cc

Browse files
committed
Move use of option values after call to ROOT_APPLY_OPTIONS()
Option values *must not be used* before calling the function ROOT_APPLY_OPTIONS(). This function is responsible for setting all values using the defaults and what was passed on the command line, so values before the call are not what the user asked for.
1 parent fd32708 commit 5e0a9cc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/modules/RootBuildOptions.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,14 @@ endif()
328328
#---webgui by default always build together with root7-----------------------------------------
329329
set(webgui_defvalue ${root7_defvalue})
330330

331+
#---Define at moment the options with the selected default values-----------------------------
332+
ROOT_APPLY_OPTIONS()
333+
331334
#---roottest option implies testing
332335
if(roottest OR rootbench)
333336
set(testing ON CACHE BOOL "" FORCE)
334337
endif()
335338

336-
#---Define at moment the options with the selected default values-----------------------------
337-
ROOT_APPLY_OPTIONS()
338-
339339
if(root7)
340340
if(NOT CMAKE_CXX_STANDARD)
341341
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++14 standard used with root7")

0 commit comments

Comments
 (0)