From 38bd7bb5e722e3fd19c90eac86825a1e90063e37 Mon Sep 17 00:00:00 2001 From: Sergey Linev <S.Linev@gsi.de> Date: Wed, 27 Mar 2019 14:31:52 +0100 Subject: [PATCH] cmake: if not configured by user, enable c++14 for root7 Show correspondent status message --- cmake/modules/RootBuildOptions.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake index 4ea98db9d0d..b2dbf46de2b 100644 --- a/cmake/modules/RootBuildOptions.cmake +++ b/cmake/modules/RootBuildOptions.cmake @@ -308,12 +308,12 @@ ROOT_APPLY_OPTIONS() if(root7) if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++14 standard used with root7") - endif() - if(NOT CMAKE_CXX_STANDARD GREATER 11) + message(STATUS "Enable C++14 for compilation of root7 components") + elseif(NOT CMAKE_CXX_STANDARD GREATER 11) message(FATAL_ERROR ">>> C++14 standard required with root7") endif() 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 built automatically when root7 is enabled)" FORCE) endif() endif() -- GitLab