USER-INTEL.cmake: fix TBB_MALLOC warning (2df524d7) · Commits · 郑智淋 / lammps

cmake/Modules/FindTBB.cmake

+0 −19

Changes for cmake/Modules/FindTBB.cmake: 0 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -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 )

0 → 100644

+27 −0

Changes for cmake/Modules/FindTBB_MALLOC.cmake: 27 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		# - 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 )

+2 −2

Changes for cmake/Modules/Packages/USER-INTEL.cmake: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -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)