From ad4725367e5e89f2f10352b6af29b6b41aa5b83a Mon Sep 17 00:00:00 2001
From: Ivan Razumov <ivan.razumov@cern.ch>
Date: Wed, 8 May 2019 12:26:24 +0200
Subject: [PATCH] QtWebEngine build fails on clang - disable
---
cmake/toolchain/heptools-dev-base.cmake | 2 +-
externals/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index d0bc5a821f..cf65a51b90 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -317,7 +317,7 @@ LCG_external_package(PyHEADTAIL 1.12.4
LCG_external_package(pyjapc 1.5.6 )
LCG_external_package(pyparsing 2.2.0 )
LCG_external_package(pyqt5 5.12 )
-IF(${LCG_OS} STREQUAL centos) # libc on slc6 is too old
+IF(${LCG_OS} STREQUAL centos) # libc on slc6 is too old; qtwebengine is blacklisted on mac/ubuntu
LCG_external_package(pyqtwebengine 5.12.1 )
endif()
LCG_external_package(pystan 2.17.1.0 )
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index addb49ef20..ec08865332 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1224,7 +1224,7 @@ endif()
if(LCG_TARGET MATCHES "icc" AND LCG_TARGET MATCHES "slc6")
set(Qt5_extra_config_opts -platform linux-icc -L/afs/cern.ch/sw/IntelSoftware/linux/x86_64/xe2013/composer_xe_2013_sp1.1.106/compiler/lib/intel64)
endif()
-if (Python_native_version VERSION_GREATER 3)
+if (Python_native_version VERSION_GREATER 3 OR LCG_COMP MATCHES "clang")
set(Qt5_qtwebengine -skip qtwebengine)
endif()
--
GitLab