diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-16 05:48:30 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-16 05:48:30 +0000 |
| commit | da77db58d7629a3bfea1a0053aa9c29764b0bc2b (patch) | |
| tree | e295b677ba30783720a7771f6b090b1f2501fa59 /pstl | |
| parent | 4a678f8072004eff9214c1a4e1836a14abb69535 (diff) | |
| download | llvm-da77db58d7629a3bfea1a0053aa9c29764b0bc2b.tar.gz | |
Revert "[cmake] Use `GNUInstallDirs` to support custom installation dirs."
https://lab.llvm.org/buildbot/#/builders/46/builds/21146 Still have
this odd error, not sure how to reproduce, so I will just try breaking
up my patch.
This reverts commit 4a678f8072004eff9214c1a4e1836a14abb69535.
Diffstat (limited to 'pstl')
| -rw-r--r-- | pstl/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt index 8784eb07b574..181f1164cf45 100644 --- a/pstl/CMakeLists.txt +++ b/pstl/CMakeLists.txt @@ -7,8 +7,6 @@ #===----------------------------------------------------------------------===## cmake_minimum_required(VERSION 3.13.4) -include(GNUInstallDirs) - 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 .*$") string(REGEX REPLACE "#define _PSTL_VERSION (.*)$" "\\1" PARALLELSTL_VERSION_SOURCE "${PARALLELSTL_VERSION_SOURCE}") @@ -92,10 +90,10 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake" DESTINATION lib/cmake/ParallelSTL) install(DIRECTORY include/ - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + DESTINATION include PATTERN "*.in" EXCLUDE) install(FILES "${PSTL_CONFIG_SITE_PATH}" - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + DESTINATION include) add_custom_target(install-pstl COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_install.cmake" -DCOMPONENT=ParallelSTL) |