[libcxx-commits] [PATCH] D60467: [pstl] Remove our custom FindTBB CMake file

[Louis Dionne via Phabricator via libcxx-commits]

ldionne created this revision.
ldionne added reviewers: rodgert, MikeDvorskiy.
Herald added subscribers: libcxx-commits, dexonsmith, jkorous, mgorny.
Herald added a project: libc++.

The TBBConfig file installed by TBB 2019 Update 5 works properly, so we
don't need this workaround anymore.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D60467

Files:
  pstl/CMakeLists.txt
  pstl/cmake/FindTBB.cmake


Index: pstl/cmake/FindTBB.cmake
===================================================================
--- pstl/cmake/FindTBB.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-#===-- FindTBB.cmake -----------------------------------------------------===##
-#
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-#===----------------------------------------------------------------------===##
-
-include(FindPackageHandleStandardArgs)
-
-if (NOT TBB_FIND_COMPONENTS)
-    set(TBB_FIND_COMPONENTS tbb tbbmalloc)
-    foreach (_tbb_component ${TBB_FIND_COMPONENTS})
-        set(TBB_FIND_REQUIRED_${_tbb_component} 1)
-    endforeach()
-endif()
-
-find_path(_tbb_include_dir tbb/tbb.h)
-if (_tbb_include_dir)
-    file(READ "${_tbb_include_dir}/tbb/tbb_stddef.h" _tbb_stddef LIMIT 2048)
-    string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}")
-    string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}")
-    string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_stddef}")
-
-    set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}")
-
-    unset(_tbb_stddef)
-    unset(_tbb_ver_major)
-    unset(_tbb_ver_minor)
-
-    foreach (_tbb_component ${TBB_FIND_COMPONENTS})
-        find_library(_tbb_release_lib ${_tbb_component})
-        if (_tbb_release_lib)
-            set(TBB_${_tbb_component}_FOUND 1)
-
-            add_library(TBB::${_tbb_component} SHARED IMPORTED)
-            list(APPEND TBB_IMPORTED_TARGETS TBB::${_tbb_component})
-
-            set(_tbb_lib_suffix)
-            if (UNIX AND NOT APPLE)
-                set(_tbb_lib_suffix ".2")
-            endif()
-
-            set_target_properties(TBB::${_tbb_component} PROPERTIES
-                                  IMPORTED_CONFIGURATIONS       "RELEASE"
-                                  IMPORTED_LOCATION_RELEASE     "${_tbb_release_lib}${_tbb_lib_suffix}"
-                                  INTERFACE_INCLUDE_DIRECTORIES "${_tbb_include_dir}")
-
-            find_library(_tbb_debug_lib ${_tbb_component}_debug)
-            if (_tbb_debug_lib)
-                set_target_properties(TBB::${_tbb_component} PROPERTIES
-                                      IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
-                                      IMPORTED_LOCATION_DEBUG "${_tbb_debug_lib}${_tbb_lib_suffix}")
-            endif()
-            unset(_tbb_debug_lib CACHE)
-            unset(_tbb_lib_suffix)
-        endif()
-        unset(_tbb_release_lib CACHE)
-    endforeach()
-endif()
-unset(_tbb_include_dir CACHE)
-
-find_package_handle_standard_args(TBB
-                                  REQUIRED_VARS TBB_IMPORTED_TARGETS
-                                  HANDLE_COMPONENTS
-                                  VERSION_VAR TBB_VERSION)
Index: pstl/CMakeLists.txt
===================================================================
--- pstl/CMakeLists.txt
+++ pstl/CMakeLists.txt
@@ -6,7 +6,6 @@
 #
 #===----------------------------------------------------------------------===##
 cmake_minimum_required(VERSION 3.4.3)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h")
 file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define PSTL_VERSION .*$")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60467.194348.patch
Type: text/x-patch
Size: 3542 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20190409/3b36669f/attachment.bin>