From 2df524d782edc47485f74f7a7df9f98dd2e1bff4 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 3 Apr 2020 07:23:03 -0600
Subject: [PATCH] USER-INTEL.cmake: fix TBB_MALLOC warning

---
 cmake/Modules/FindTBB.cmake             | 19 -----------------
 cmake/Modules/FindTBB_MALLOC.cmake      | 27 +++++++++++++++++++++++++
 cmake/Modules/Packages/USER-INTEL.cmake |  4 ++--
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 cmake/Modules/FindTBB_MALLOC.cmake

diff --git a/cmake/Modules/FindTBB.cmake b/cmake/Modules/FindTBB.cmake
index 8cc050817e..91561eca9a 100644
--- a/cmake/Modules/FindTBB.cmake
+++ b/cmake/Modules/FindTBB.cmake
@@ -25,22 +25,3 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR)
 
 mark_as_advanced(TBB_INCLUDE_DIR TBB_LIBRARY )
-
-########################################################
-# TBB Malloc
-
-find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include)
-find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.7
-                                                      $ENV{TBBROOT}/lib/intel64/gcc4.4
-                                                      $ENV{TBBROOT}/lib/intel64/gcc4.1)
-
-set(TBB_MALLOC_LIBRARIES ${TBB_MALLOC_LIBRARY})
-set(TBB_MALLOC_INCLUDE_DIRS ${TBB_MALLOC_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set TBB_MALLOC_FOUND to TRUE
-# if all listed variables are TRUE
-
-find_package_handle_standard_args(TBB_MALLOC DEFAULT_MSG TBB_MALLOC_LIBRARY TBB_MALLOC_INCLUDE_DIR)
-
-mark_as_advanced(TBB_MALLOC_INCLUDE_DIR TBB_MALLOC_LIBRARY )
diff --git a/cmake/Modules/FindTBB_MALLOC.cmake b/cmake/Modules/FindTBB_MALLOC.cmake
new file mode 100644
index 0000000000..f46c5fd5f5
--- /dev/null
+++ b/cmake/Modules/FindTBB_MALLOC.cmake
@@ -0,0 +1,27 @@
+# - Find parts of TBB_MALLOC
+# Find the native TBB_MALLOC headers and libraries.
+#
+#  TBB_MALLOC_INCLUDE_DIRS - where to find tbb.h, etc.
+#  TBB_MALLOC_LIBRARIES    - List of libraries when using tbb.
+#  TBB_MALLOC_FOUND        - True if tbb found.
+#
+
+
+########################################################
+# TBB Malloc
+
+find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include)
+find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.7
+                                                      $ENV{TBBROOT}/lib/intel64/gcc4.4
+                                                      $ENV{TBBROOT}/lib/intel64/gcc4.1)
+
+set(TBB_MALLOC_LIBRARIES ${TBB_MALLOC_LIBRARY})
+set(TBB_MALLOC_INCLUDE_DIRS ${TBB_MALLOC_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set TBB_MALLOC_FOUND to TRUE
+# if all listed variables are TRUE
+
+find_package_handle_standard_args(TBB_MALLOC DEFAULT_MSG TBB_MALLOC_LIBRARY TBB_MALLOC_INCLUDE_DIR)
+
+mark_as_advanced(TBB_MALLOC_INCLUDE_DIR TBB_MALLOC_LIBRARY )
diff --git a/cmake/Modules/Packages/USER-INTEL.cmake b/cmake/Modules/Packages/USER-INTEL.cmake
index 6a3b9fdfb3..0b08930603 100644
--- a/cmake/Modules/Packages/USER-INTEL.cmake
+++ b/cmake/Modules/Packages/USER-INTEL.cmake
@@ -42,8 +42,8 @@ if(PKG_USER-INTEL)
     message(WARNING "USER-INTEL gives best performance with Intel compilers")
   endif()
 
-  find_package(TBB QUIET)
-  if(TBB_FOUND)
+  find_package(TBB_MALLOC QUIET)
+  if(TBB_MALLOC_FOUND)
     target_link_libraries(lammps PRIVATE ${TBB_MALLOC_LIBRARIES})
   else()
     target_compile_definitions(lammps PRIVATE -DLMP_INTEL_NO_TBB)