From 2b09cb6ed1af39a2ca2b822c47ceacb8d81a4d37 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 5 Aug 2020 13:03:51 -0600 Subject: [PATCH] ATDM: Set Sacado_ENABLE_GTest=OFF for tlcc2 intel-18 (#7778) Code related to this test does not build with this intel-18.0.0.20170811 compiler. --- cmake/std/atdm/tlcc2/tweaks/INTEL_DEBUG_OPENMP_SNB.cmake | 0 cmake/std/atdm/tlcc2/tweaks/INTEL_RELEASE_OPENMP_SNB.cmake | 0 cmake/std/atdm/tlcc2/tweaks/Tweaks.cmake | 3 +++ 3 files changed, 3 insertions(+) delete mode 100644 cmake/std/atdm/tlcc2/tweaks/INTEL_DEBUG_OPENMP_SNB.cmake delete mode 100644 cmake/std/atdm/tlcc2/tweaks/INTEL_RELEASE_OPENMP_SNB.cmake create mode 100644 cmake/std/atdm/tlcc2/tweaks/Tweaks.cmake diff --git a/cmake/std/atdm/tlcc2/tweaks/INTEL_DEBUG_OPENMP_SNB.cmake b/cmake/std/atdm/tlcc2/tweaks/INTEL_DEBUG_OPENMP_SNB.cmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/cmake/std/atdm/tlcc2/tweaks/INTEL_RELEASE_OPENMP_SNB.cmake b/cmake/std/atdm/tlcc2/tweaks/INTEL_RELEASE_OPENMP_SNB.cmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/cmake/std/atdm/tlcc2/tweaks/Tweaks.cmake b/cmake/std/atdm/tlcc2/tweaks/Tweaks.cmake new file mode 100644 index 000000000000..826790621034 --- /dev/null +++ b/cmake/std/atdm/tlcc2/tweaks/Tweaks.cmake @@ -0,0 +1,3 @@ +# Disable Sacado GTest tests with this intel-18 compiler to avoid build error +# (#7778) +ATDM_SET_ENABLE(Sacado_ENABLE_GTest OFF)