From 5b7e0374f45e6b592a5b36df8be125a79d2deabd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= <mikolaj.zuzek@ng-analytics.com>
Date: Fri, 12 Nov 2021 19:04:52 +0100
Subject: [PATCH] Fix: leave default for OMPT support in Caliper

---
 CMakeLists.txt             | 1 -
 cmake/configure_tpls.cmake | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd269821d..42439ecf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,6 @@ if(KokkosTools_ENABLE_PAPI)
 else()
   message(STATUS "PAPI support disabled")
 endif()
-find_package(OpenMP)
 if(KokkosTools_ENABLE_MPI)
   find_package(MPI REQUIRED)
   message(STATUS "Found MPI ${MPI_CXX_VERSION}")
diff --git a/cmake/configure_tpls.cmake b/cmake/configure_tpls.cmake
index 11f28eaa5..45ce787e5 100644
--- a/cmake/configure_tpls.cmake
+++ b/cmake/configure_tpls.cmake
@@ -8,12 +8,8 @@ macro(configure_caliper)
   set(CALIPER_WITH_FORTRAN OFF)  # Build and install Fortran wrappers.
   set(CALIPER_WITH_KOKKOS ON)    # Enable Kokkos profiling support
 
-  # Build with support for the OpenMP tools interface.
-  if(OpenMP_FOUND)
-    set(CALIPER_WITH_OMPT ON)
-  else()
-    set(CALIPER_WITH_OMPT OFF)
-  endif()
+  # Note: Let Caliper figure that out or it may fail on missing omp-tools.h
+  # set(CALIPER_WITH_OMPT OFF) # Build with support for the OpenMP tools interface.
 
   set(CALIPER_WITH_SAMPLER ON)  # Enable time-based sampling on Linux.
   set(CALIPER_WITH_TOOLS ON)    # Build Caliper’s tools (i.e, cali-query and mpi-caliquery). Default: On.