This is an archive of the discontinued LLVM Phabricator instance.

Differential D117418

[pstl][cmake] Use `GNUInstallDirs` to support custom installation dirs
ClosedPublic

Authored by Ericson2314 on Jan 15 2022, 10:07 PM.

Details

Reviewers
compnerd
phosek
beanz
ldionne
Group Reviewers
Restricted Project
Commits
rGc90d136be4e0: [pstl][cmake] Use `GNUInstallDirs` to support custom installation dirs
Summary

I am breaking apart D99484 so the cause of build failures is easier to
understand.

Diff Detail

Event Timeline

Ericson2314 created this revision.Jan 15 2022, 10:07 PM
Herald added a reviewer: ldionne. · View Herald TranscriptJan 15 2022, 10:07 PM
Herald added a subscriber: mgorny. · View Herald Transcript
Ericson2314 requested review of this revision.Jan 15 2022, 10:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 15 2022, 10:07 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Ericson2314 retitled this revision from [pstl][cmake] Use `GNUInstallDirs` to support custom installation dirs. to [pstl][cmake] Use `GNUInstallDirs` to support custom installation dirs.Jan 15 2022, 10:14 PM
Ericson2314 mentioned this in D99484: [clang-tools-extra][cmake] Use `GNUInstallDirs` to support custom installation dirs..Jan 15 2022, 10:23 PM
Harbormaster completed remote builds in B143642: Diff 400344.Jan 15 2022, 10:27 PM
ldionne accepted this revision.Jan 17 2022, 8:50 AM
This revision is now accepted and ready to land.Jan 17 2022, 8:50 AM
Closed by commit rGc90d136be4e0: [pstl][cmake] Use `GNUInstallDirs` to support custom installation dirs (authored by Ericson2314). · Explain WhyJan 17 2022, 12:04 PM
This revision was automatically updated to reflect the committed changes.
Ericson2314 added a commit: rGc90d136be4e0: [pstl][cmake] Use `GNUInstallDirs` to support custom installation dirs.

Revision Contents

PathSize
pstl/
6 lines

Diff 400615

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.13.4) cmake_minimum_required(VERSION 3.13.4)
include(GNUInstallDirs)
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} / 1000)") math(EXPR VERSION_MAJOR "(${PARALLELSTL_VERSION_SOURCE} / 1000)")
math(EXPR VERSION_MINOR "((${PARALLELSTL_VERSION_SOURCE} % 1000) / 10)") math(EXPR VERSION_MINOR "((${PARALLELSTL_VERSION_SOURCE} % 1000) / 10)")
math(EXPR VERSION_PATCH "(${PARALLELSTL_VERSION_SOURCE} % 10)") math(EXPR VERSION_PATCH "(${PARALLELSTL_VERSION_SOURCE} % 10)")
project(ParallelSTL VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} LANGUAGES CXX) project(ParallelSTL VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} LANGUAGES CXX)
▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Lines
install(EXPORT ParallelSTLTargets install(EXPORT ParallelSTLTargets
FILE ParallelSTLTargets.cmake FILE ParallelSTLTargets.cmake
NAMESPACE pstl:: NAMESPACE pstl::
DESTINATION lib/cmake/ParallelSTL) DESTINATION lib/cmake/ParallelSTL)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake"
DESTINATION lib/cmake/ParallelSTL) DESTINATION lib/cmake/ParallelSTL)
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
PATTERN "*.in" EXCLUDE) PATTERN "*.in" EXCLUDE)
install(FILES "${PSTL_CONFIG_SITE_PATH}" install(FILES "${PSTL_CONFIG_SITE_PATH}"
DESTINATION include) DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
add_custom_target(install-pstl add_custom_target(install-pstl
COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_install.cmake" -DCOMPONENT=ParallelSTL) COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_install.cmake" -DCOMPONENT=ParallelSTL)