[libcxx-commits] [pstl] r368672 - [pstl] Rename PARALLELSTL_BACKEND to PSTL_PARALLEL_BACKEND

[Louis Dionne via libcxx-commits]

Author: ldionne
Date: Tue Aug 13 04:50:26 2019
New Revision: 368672

URL: http://llvm.org/viewvc/llvm-project?rev=368672&view=rev
Log:
[pstl] Rename PARALLELSTL_BACKEND to PSTL_PARALLEL_BACKEND

It makes more sense to name configuration options as PSTL_XXX.
Also, I'm naming it PSTL_PARALLEL_BACKEND because we might introduce
the ability to customize the vectorization backend, in which case
PSTL_BACKEND would become ambiguous.

Modified:
    pstl/trunk/CMakeLists.txt
    pstl/trunk/cmake/ParallelSTLConfig.cmake.in

Modified: pstl/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/CMakeLists.txt?rev=368672&r1=368671&r2=368672&view=diff
==============================================================================
--- pstl/trunk/CMakeLists.txt (original)
+++ pstl/trunk/CMakeLists.txt Tue Aug 13 04:50:26 2019
@@ -16,7 +16,7 @@ math(EXPR VERSION_PATCH "(${PARALLELSTL_
 
 project(ParallelSTL VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} LANGUAGES CXX)
 
-set(PARALLELSTL_BACKEND "serial" CACHE STRING "Threading backend to use. Valid choices are 'serial' and 'tbb'. The default is 'serial'.")
+set(PSTL_PARALLEL_BACKEND "serial" CACHE STRING "Threading backend to use. Valid choices are 'serial' and 'tbb'. The default is 'serial'.")
 
 if (NOT TBB_DIR)
     get_filename_component(PSTL_DIR_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
@@ -33,16 +33,16 @@ add_library(ParallelSTL INTERFACE)
 add_library(pstl::ParallelSTL ALIAS ParallelSTL)
 target_compile_features(ParallelSTL INTERFACE cxx_std_17)
 
-if (PARALLELSTL_BACKEND STREQUAL "serial")
+if (PSTL_PARALLEL_BACKEND STREQUAL "serial")
     message(STATUS "Parallel STL uses the serial backend")
     set(_PSTL_PAR_BACKEND_SERIAL ON)
-elseif (PARALLELSTL_BACKEND STREQUAL "tbb")
+elseif (PSTL_PARALLEL_BACKEND STREQUAL "tbb")
     find_package(TBB 2018 REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc)
     message(STATUS "Parallel STL uses TBB ${TBB_VERSION} (interface version: ${TBB_INTERFACE_VERSION})")
     target_link_libraries(ParallelSTL INTERFACE TBB::tbb)
     set(_PSTL_PAR_BACKEND_TBB ON)
 else()
-    message(FATAL_ERROR "Requested unknown Parallel STL backend '${PARALLELSTL_BACKEND}'.")
+    message(FATAL_ERROR "Requested unknown Parallel STL backend '${PSTL_PARALLEL_BACKEND}'.")
 endif()
 
 set(PSTL_GENERATED_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated_headers")

Modified: pstl/trunk/cmake/ParallelSTLConfig.cmake.in
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/cmake/ParallelSTLConfig.cmake.in?rev=368672&r1=368671&r2=368672&view=diff
==============================================================================
--- pstl/trunk/cmake/ParallelSTLConfig.cmake.in (original)
+++ pstl/trunk/cmake/ParallelSTLConfig.cmake.in Tue Aug 13 04:50:26 2019
@@ -8,9 +8,9 @@
 
 include(CMakeFindDependencyMacro)
 
-set(PARALLELSTL_BACKEND "@PARALLELSTL_BACKEND@")
+set(PSTL_PARALLEL_BACKEND "@PSTL_PARALLEL_BACKEND@")
 
-if (PARALLELSTL_BACKEND STREQUAL "tbb")
+if (PSTL_PARALLEL_BACKEND STREQUAL "tbb")
     find_dependency(TBB REQUIRED tbb)
 endif()