This is an archive of the discontinued LLVM Phabricator instance.

Differential D60467

[pstl] Remove our custom FindTBB CMake file
ClosedPublic

Authored by ldionne on Apr 9 2019, 8:58 AM.

Details

Reviewers
rodgert
MikeDvorskiy
Commits
rGe7f2cbe45a35: [pstl] Remove our custom FindTBB CMake file
rL358196: [pstl] Remove our custom FindTBB CMake file
rPSTL358196: [pstl] Remove our custom FindTBB CMake file
Summary

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

Diff Detail

Event Timeline

ldionne created this revision.Apr 9 2019, 8:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 9 2019, 8:58 AM
Herald added subscribers: libcxx-commits, dexonsmith, jkorous, mgorny. · View Herald Transcript
Harbormaster completed remote builds in B30256: Diff 194348.Apr 9 2019, 8:58 AM
ldionne added a comment.Apr 9 2019, 9:30 AM

Ahh, we can't actually do this until they fix https://github.com/01org/tbb/issues/135 and release it.

MikeDvorskiy accepted this revision.Apr 10 2019, 1:53 AM
This revision is now accepted and ready to land.Apr 10 2019, 1:53 AM
ldionne added a comment.Apr 11 2019, 10:20 AM
In D60467#1460015, @ldionne wrote:

Ahh, we can't actually do this until they fix https://github.com/01org/tbb/issues/135 and release it.

Actually, that's wrong. I can apply this right now as only the Homebrew formula is still broken, but they're fixing it in https://github.com/Homebrew/homebrew-core/pull/38844.

Closed by commit rPSTL358196: [pstl] Remove our custom FindTBB CMake file (authored by ldionne). · Explain WhyApr 11 2019, 10:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
pstl/
1 line
cmake/

Diff 194348

pstl/CMakeLists.txt

#===-- CMakeLists.txt ----------------------------------------------------===## #===-- CMakeLists.txt ----------------------------------------------------===##
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
#===----------------------------------------------------------------------===## #===----------------------------------------------------------------------===##
cmake_minimum_required(VERSION 3.4.3) 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") 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 .*$") file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define PSTL_VERSION .*$")
string(REGEX REPLACE "#define PSTL_VERSION (.*)$" "\\1" PARALLELSTL_VERSION_SOURCE "${PARALLELSTL_VERSION_SOURCE}") string(REGEX REPLACE "#define PSTL_VERSION (.*)$" "\\1" PARALLELSTL_VERSION_SOURCE "${PARALLELSTL_VERSION_SOURCE}")
math(EXPR VERSION_MAJOR "${PARALLELSTL_VERSION_SOURCE} / 100") math(EXPR VERSION_MAJOR "${PARALLELSTL_VERSION_SOURCE} / 100")
math(EXPR VERSION_MINOR "${PARALLELSTL_VERSION_SOURCE} % 100") math(EXPR VERSION_MINOR "${PARALLELSTL_VERSION_SOURCE} % 100")
project(ParallelSTL VERSION ${VERSION_MAJOR}.${VERSION_MINOR} LANGUAGES CXX) project(ParallelSTL VERSION ${VERSION_MAJOR}.${VERSION_MINOR} LANGUAGES CXX)
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines

pstl/cmake/FindTBB.cmake

  • This file was deleted.
#===-- 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)