Skip to content
Snippets Groups Projects
Commit 00006a2b authored by Sergey Linev's avatar Sergey Linev Committed by Axel Naumann
Browse files

cmake: check more precisely if webui was disabled intentionally

parent f86cefcc
Branches
Tags
No related merge requests found
...@@ -20,7 +20,7 @@ endfunction() ...@@ -20,7 +20,7 @@ endfunction()
function(ROOT_APPLY_OPTIONS) function(ROOT_APPLY_OPTIONS)
foreach(opt ${root_build_options}) foreach(opt ${root_build_options})
option(${opt} "${${opt}_description}" ${${opt}_defvalue}) option(${opt} "${${opt}_description}" ${${opt}_defvalue})
endforeach() endforeach()
endfunction() endfunction()
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
...@@ -273,7 +273,7 @@ endif() ...@@ -273,7 +273,7 @@ endif()
#---Options depending of CMake Generator------------------------------------------------------- #---Options depending of CMake Generator-------------------------------------------------------
if( CMAKE_GENERATOR STREQUAL Ninja) if( CMAKE_GENERATOR STREQUAL Ninja)
set(fortran_defvalue OFF) set(fortran_defvalue OFF)
endif() endif()
#---Apply minimal or gminimal------------------------------------------------------------------ #---Apply minimal or gminimal------------------------------------------------------------------
...@@ -293,7 +293,7 @@ if(NOT CMAKE_CXX_STANDARD GREATER 11) ...@@ -293,7 +293,7 @@ if(NOT CMAKE_CXX_STANDARD GREATER 11)
set(webui_defvalue OFF) set(webui_defvalue OFF)
endif() endif()
if("${webui}" STREQUAL "OFF") if (NOT webui AND NOT "${webui}" STREQUAL "")
set(webui_disabled ON) set(webui_disabled ON)
endif() endif()
...@@ -311,7 +311,7 @@ if(root7) ...@@ -311,7 +311,7 @@ if(root7)
endif() endif()
if(NOT webui AND NOT webui_disabled) if(NOT webui AND NOT webui_disabled)
set(webui ON CACHE BOOL "(webui build automatically when root7 is enabled)" FORCE) set(webui ON CACHE BOOL "(webui build automatically when root7 is enabled)" FORCE)
endif() endif()
endif() endif()
#---check if webui can be build------------------------------- #---check if webui can be build-------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment