From 80d3816fb039c66a777096d42bed529968d907d8 Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Thu, 2 May 2019 15:47:34 +0200
Subject: [PATCH] RootBuildOptions.cmake: move platform defaults after all=ON
We do not want -Dall=ON enabling unsupported options, like
Davix support on Windows, etc.
---
cmake/modules/RootBuildOptions.cmake | 35 ++++++++++++++--------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
index a965fe98d4b..a89b36dca60 100644
--- a/cmake/modules/RootBuildOptions.cmake
+++ b/cmake/modules/RootBuildOptions.cmake
@@ -196,23 +196,6 @@ else()
"Known values are zlib, lzma, lz4 (case-insensitive).")
endif()
-#--- Minor chnages in defaults due to platform--------------------------------------------------
-if(WIN32)
- set(x11_defvalue OFF)
- set(memstat_defvalue OFF)
- set(davix_defvalue OFF)
- set(imt_defvalue OFF)
- set(builtin_tbb_defvalue OFF)
- set(tmva_defvalue OFF)
- set(roofit_defvalue OFF)
- set(roottest_defvalue OFF)
- set(testing_defvalue OFF)
- set(vdt_defvalue OFF)
-elseif(APPLE)
- set(x11_defvalue OFF)
- set(cocoa_defvalue ON)
-endif()
-
#--- The 'all' option swithes ON major options---------------------------------------------------
if(all)
set(alien_defvalue ON)
@@ -300,6 +283,24 @@ endif()
#---webui always build together with root7----------------------------------------------------
set(webui_defvalue ${root7})
+#---Changes in defaults due to platform-------------------------------------------------------
+if(WIN32)
+ set(builtin_tbb_defvalue OFF)
+ set(davix_defvalue OFF)
+ set(imt_defvalue OFF)
+ set(memstat_defvalue OFF)
+ set(roofit_defvalue OFF)
+ set(roottest_defvalue OFF)
+ set(testing_defvalue OFF)
+ set(tmva_defvalue OFF)
+ set(vdt_defvalue OFF)
+ set(x11_defvalue OFF)
+elseif(APPLE)
+ set(cocoa_defvalue ON)
+ set(x11_defvalue OFF)
+ set(xft_defvalue OFF)
+endif()
+
#---Vc supports only x86_64 architecture-------------------------------------------------------
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
message(STATUS "Vc does not support ${CMAKE_SYSTEM_PROCESSOR}. Support for Vc disabled.")
--
GitLab