From 0a9f4c29ed897548c1f72e15ceb5418b8686e9ea Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Mon, 18 Feb 2019 11:32:11 +0100
Subject: [PATCH] RootBuildOptions.cmake: remove logic that breaks default
settings
Before calling ROOT_APPLY_OPTIONS(), no options are set yet, which
means the else() is always taken here, turning off all tmva components
unless one specifies -Dtmva=ON on the CMake command line.
---
cmake/modules/RootBuildOptions.cmake | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
index 104df1cb24d..b62b4493052 100644
--- a/cmake/modules/RootBuildOptions.cmake
+++ b/cmake/modules/RootBuildOptions.cmake
@@ -184,21 +184,6 @@ if (runtime_cxxmodules)
set(pch_defvalue OFF)
endif(runtime_cxxmodules)
-#--- TMVA --------------------------------------------------------------------------------------
-# User can specify either old name or new name for enabling rmva
-if (tmva)
- if (r OR tmva-rmva)
- set(r ON)
- set(tmva-rmva ON)
- endif()
-else()
- set(tmva-cpu OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-cpu_description})" FORCE)
- set(tmva-gpu OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-gpu_description})" FORCE)
- set(tmva-rmva OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-rmva_description})" FORCE)
- set(tmva-pymva OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-pymva_description})" FORCE)
-endif()
-
-
#--- Compression algorithms in ROOT-------------------------------------------------------------
set(compression_default "zlib" CACHE STRING "Default compression algorithm (zlib (default), lz4, or lzma)")
string(TOLOWER "${compression_default}" compression_default)
--
GitLab