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

cmake: use set(webui_defvalue ${root7})

webui should always be build with root7, if other is not specified
parent 59260213
No related branches found
No related tags found
No related merge requests found
...@@ -229,7 +229,6 @@ if(all) ...@@ -229,7 +229,6 @@ if(all)
set(r_defvalue ON) set(r_defvalue ON)
set(roofit_defvalue ON) set(roofit_defvalue ON)
set(root7_defvalue ON) set(root7_defvalue ON)
set(webui_defvalue ON)
set(shadowpw_defvalue ON) set(shadowpw_defvalue ON)
set(table_defvalue ON) set(table_defvalue ON)
set(unuran_defvalue ON) set(unuran_defvalue ON)
...@@ -265,6 +264,9 @@ if(builtin_all) ...@@ -265,6 +264,9 @@ if(builtin_all)
set(builtin_zlib_defvalue ON) set(builtin_zlib_defvalue ON)
endif() endif()
#---webui always build together with root7----------------------------------------------------
set(webui_defvalue ${root7})
#---Vc supports only x86_64 architecture------------------------------------------------------- #---Vc supports only x86_64 architecture-------------------------------------------------------
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
message(STATUS "Vc does not support ${CMAKE_SYSTEM_PROCESSOR}. Support for Vc disabled.") message(STATUS "Vc does not support ${CMAKE_SYSTEM_PROCESSOR}. Support for Vc disabled.")
...@@ -290,11 +292,6 @@ endforeach() ...@@ -290,11 +292,6 @@ endforeach()
#---ROOT 7 requires C++14 standard or higher--------------------------------------------------- #---ROOT 7 requires C++14 standard or higher---------------------------------------------------
if(NOT CMAKE_CXX_STANDARD GREATER 11) if(NOT CMAKE_CXX_STANDARD GREATER 11)
set(root7_defvalue OFF) set(root7_defvalue OFF)
set(webui_defvalue OFF)
endif()
if (NOT webui AND NOT "${webui}" STREQUAL "")
set(webui_disabled ON)
endif() endif()
#---roottest option implies testing #---roottest option implies testing
...@@ -312,9 +309,6 @@ if(root7) ...@@ -312,9 +309,6 @@ if(root7)
elseif(NOT CMAKE_CXX_STANDARD GREATER 11) elseif(NOT CMAKE_CXX_STANDARD GREATER 11)
message(FATAL_ERROR ">>> At least C++14 standard required with root7") message(FATAL_ERROR ">>> At least C++14 standard required with root7")
endif() endif()
if(NOT webui AND NOT webui_disabled)
set(webui ON CACHE BOOL "(webui built automatically when root7 is enabled)" FORCE)
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.
Finish editing this message first!
Please register or to comment