Skip to content

Commit da77db5

Browse files
Ericson2314Ericson2314
committed
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 4a678f8.
1 parent 4a678f8 commit da77db5

File tree

36 files changed

+68
-96
lines changed

36 files changed

+68
-96
lines changed

‎clang-tools-extra/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include(CMakeDependentOption)
2-
include(GNUInstallDirs)
32

43
option(CLANG_TIDY_ENABLE_STATIC_ANALYZER
54
"Include static analyzer checks in clang-tidy" ON)

‎clang-tools-extra/clang-doc/tool/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ target_link_libraries(clang-doc
1919
)
2020

2121
install(FILES ../assets/clang-doc-default-stylesheet.css
22-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
22+
DESTINATION share/clang
2323
COMPONENT clang-doc)
2424

2525
install(FILES ../assets/index.js
26-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
26+
DESTINATION share/clang
2727
COMPONENT clang-doc)

‎clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ target_link_libraries(find-all-symbols
2020
)
2121

2222
install(PROGRAMS run-find-all-symbols.py
23-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
23+
DESTINATION share/clang
2424
COMPONENT find-all-symbols)

‎clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ target_link_libraries(clang-include-fixer
2121
)
2222

2323
install(PROGRAMS clang-include-fixer.el
24-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
24+
DESTINATION share/clang
2525
COMPONENT clang-include-fixer)
2626
install(PROGRAMS clang-include-fixer.py
27-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
27+
DESTINATION share/clang
2828
COMPONENT clang-include-fixer)

‎clang-tools-extra/clang-tidy/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ add_subdirectory(utils)
113113

114114
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
115115
install(DIRECTORY .
116-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/clang-tidy"
116+
DESTINATION include/clang-tidy
117117
COMPONENT clang-tidy-headers
118118
FILES_MATCHING
119119
PATTERN "*.h"

‎clang-tools-extra/clang-tidy/tool/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ target_link_libraries(clang-tidy
5252

5353

5454
install(PROGRAMS clang-tidy-diff.py
55-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
55+
DESTINATION share/clang
5656
COMPONENT clang-tidy)
5757
install(PROGRAMS run-clang-tidy.py
58-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
58+
DESTINATION bin
5959
COMPONENT clang-tidy
6060
RENAME run-clang-tidy)

‎clang-tools-extra/modularize/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize
2323
)
2424

2525
install(TARGETS modularize
26-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
26+
RUNTIME DESTINATION bin
2727
COMPONENT clang-extras)

‎clang/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.13.4)
22

3-
include(GNUInstallDirs)
4-
53
# If we are not building as a part of LLVM, build Clang as an
64
# standalone project, using LLVM as an external library:
75
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -426,7 +424,7 @@ include_directories(BEFORE
426424

427425
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
428426
install(DIRECTORY include/clang include/clang-c
429-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
427+
DESTINATION include
430428
COMPONENT clang-headers
431429
FILES_MATCHING
432430
PATTERN "*.def"
@@ -435,7 +433,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
435433
)
436434

437435
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang
438-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
436+
DESTINATION include
439437
COMPONENT clang-headers
440438
FILES_MATCHING
441439
PATTERN "CMakeFiles" EXCLUDE
@@ -455,7 +453,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
455453

456454
add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh)
457455
install(PROGRAMS utils/bash-autocomplete.sh
458-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
456+
DESTINATION share/clang
459457
COMPONENT bash-autocomplete)
460458
if(NOT LLVM_ENABLE_IDE)
461459
add_llvm_install_targets(install-bash-autocomplete

‎clang/cmake/modules/AddClang.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
include(GNUInstallDirs)
21
include(LLVMDistributionSupport)
32

43
function(clang_tablegen)
@@ -121,7 +120,7 @@ macro(add_clang_library name)
121120
${export_to_clangtargets}
122121
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
123122
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
124-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
123+
RUNTIME DESTINATION bin)
125124

126125
if (NOT LLVM_ENABLE_IDE)
127126
add_llvm_install_targets(install-${lib}
@@ -160,7 +159,7 @@ macro(add_clang_tool name)
160159
get_target_export_arg(${name} Clang export_to_clangtargets)
161160
install(TARGETS ${name}
162161
${export_to_clangtargets}
163-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
162+
RUNTIME DESTINATION bin
164163
COMPONENT ${name})
165164

166165
if(NOT LLVM_ENABLE_IDE)

‎clang/tools/c-index-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
4949
set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH
5050
"@executable_path/../../lib")
5151
else()
52-
set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
52+
set(INSTALL_DESTINATION bin)
5353
endif()
5454

5555
install(TARGETS c-index-test

‎clang/tools/clang-format/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE )
2121
endif()
2222

2323
install(PROGRAMS clang-format-bbedit.applescript
24-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
24+
DESTINATION share/clang
2525
COMPONENT clang-format)
2626
install(PROGRAMS clang-format-diff.py
27-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
27+
DESTINATION share/clang
2828
COMPONENT clang-format)
2929
install(PROGRAMS clang-format-sublime.py
30-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
30+
DESTINATION share/clang
3131
COMPONENT clang-format)
3232
install(PROGRAMS clang-format.el
33-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
33+
DESTINATION share/clang
3434
COMPONENT clang-format)
3535
install(PROGRAMS clang-format.py
36-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
36+
DESTINATION share/clang
3737
COMPONENT clang-format)
3838
install(PROGRAMS git-clang-format
39-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
39+
DESTINATION bin
4040
COMPONENT clang-format)

‎clang/tools/clang-nvlink-wrapper/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper
2222
${CLANG_NVLINK_WRAPPER_LIB_DEPS}
2323
)
2424

25-
install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
25+
install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION bin)

‎clang/tools/clang-rename/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename
1919
)
2020

2121
install(PROGRAMS clang-rename.py
22-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
22+
DESTINATION share/clang
2323
COMPONENT clang-rename)
2424
install(PROGRAMS clang-rename.el
25-
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
25+
DESTINATION share/clang
2626
COMPONENT clang-rename)

‎clang/tools/libclang/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ endif()
186186
if(INTERNAL_INSTALL_PREFIX)
187187
set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include")
188188
else()
189-
set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
189+
set(LIBCLANG_HEADERS_INSTALL_DESTINATION include)
190190
endif()
191191

192192
install(DIRECTORY ../../include/clang-c

‎clang/tools/scan-build-py/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles})
4343
${CMAKE_BINARY_DIR}/bin/scan-build-py
4444
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build)
4545
install (PROGRAMS "bin/scan-build"
46-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
46+
DESTINATION bin
4747
RENAME scan-build-py
4848
COMPONENT scan-build-py)
4949
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py)
@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles})
5656
${CMAKE_BINARY_DIR}/bin/
5757
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
5858
install(PROGRAMS bin/${BinFile}
59-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
59+
DESTINATION bin
6060
COMPONENT scan-build-py)
6161
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
6262
endif()
@@ -72,7 +72,7 @@ foreach(lib ${LibExecs})
7272
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${lib})
7373
list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${lib})
7474
install(PROGRAMS libexec/${lib}
75-
DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}"
75+
DESTINATION libexec
7676
COMPONENT scan-build-py)
7777
endforeach()
7878

‎clang/tools/scan-build/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
4747
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
4848
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
4949
install(PROGRAMS bin/${BinFile}
50-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
50+
DESTINATION bin
5151
COMPONENT scan-build)
5252
endforeach()
5353

@@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD)
6161
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile})
6262
list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile})
6363
install(PROGRAMS libexec/${LibexecFile}
64-
DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}"
64+
DESTINATION libexec
6565
COMPONENT scan-build)
6666
endforeach()
6767

@@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD)
8989
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile})
9090
list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile})
9191
install(FILES share/scan-build/${ShareFile}
92-
DESTINATION "${CMAKE_INSTALL_DATADIR}/scan-build"
92+
DESTINATION share/scan-build
9393
COMPONENT scan-build)
9494
endforeach()
9595

‎clang/tools/scan-view/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW)
2020
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
2121
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
2222
install(PROGRAMS bin/${BinFile}
23-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
23+
DESTINATION bin
2424
COMPONENT scan-view)
2525
endforeach()
2626

@@ -34,7 +34,7 @@ if(CLANG_INSTALL_SCANVIEW)
3434
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})
3535
list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})
3636
install(FILES share/${ShareFile}
37-
DESTINATION "${CMAKE_INSTALL_DATADIR}/scan-view"
37+
DESTINATION share/scan-view
3838
COMPONENT scan-view)
3939
endforeach()
4040

‎clang/utils/hmaptool/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM
1010

1111
list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})
1212
install(PROGRAMS ${CLANG_HMAPTOOL}
13-
DESTINATION "${CMAKE_INSTALL_BINDIR}"
13+
DESTINATION bin
1414
COMPONENT hmaptool)
1515

1616
add_custom_target(hmaptool ALL DEPENDS ${Depends})

‎compiler-rt/cmake/base-config-ix.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
include(CheckIncludeFile)
77
include(CheckCXXSourceCompiles)
8-
include(GNUInstallDirs)
98
include(ExtendPath)
109

1110
check_include_file(unwind.h HAVE_UNWIND_H)
@@ -109,13 +108,13 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
109108
set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
110109
"Path where built compiler-rt libraries should be installed.")
111110
endif()
112-
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_BINDIR}")
111+
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" bin)
113112
set(COMPILER_RT_INSTALL_BINARY_DIR "${default_install_path}" CACHE PATH
114113
"Path where built compiler-rt executables should be installed.")
115-
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_INCLUDEDIR}")
114+
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" include)
116115
set(COMPILER_RT_INSTALL_INCLUDE_DIR "${default_install_path}" CACHE PATH
117116
"Path where compiler-rt headers should be installed.")
118-
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}")
117+
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" share)
119118
set(COMPILER_RT_INSTALL_DATA_DIR "${default_install_path}" CACHE PATH
120119
"Path where compiler-rt data files should be installed.")
121120

‎libc/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.13.4)
22

3-
include(GNUInstallDirs)
4-
53
# Use old version of target_sources command which converts the source
64
# file paths to full paths.
75
cmake_policy(SET CMP0076 OLD)

‎libcxx/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ endif()
1010
#===============================================================================
1111
cmake_minimum_required(VERSION 3.13.4)
1212

13-
include(GNUInstallDirs)
14-
1513
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
1614

1715
# Add path for custom modules
@@ -414,9 +412,9 @@ endif ()
414412
# TODO: Projects that depend on libc++ should use LIBCXX_GENERATED_INCLUDE_DIR
415413
# instead of hard-coding include/c++/v1.
416414

417-
set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
415+
set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
418416
"Path where target-agnostic libc++ headers should be installed.")
419-
set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
417+
set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
420418
"Path where built libc++ runtime libraries should be installed.")
421419

422420
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
@@ -425,7 +423,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
425423
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1")
426424
set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
427425
"Path where built libc++ libraries should be installed.")
428-
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
426+
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
429427
"Path where target-specific libc++ headers should be installed.")
430428
if(LIBCXX_LIBDIR_SUBDIR)
431429
string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR})

‎libcxx/cmake/Modules/HandleLibCXXABI.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
12
#===============================================================================
23
# Add an ABI library if appropriate
34
#===============================================================================
45

5-
include(GNUInstallDirs)
6-
76
#
87
# _setup_abi: Set up the build to use an ABI library
98
#
@@ -64,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs)
6463

6564
if (LIBCXX_INSTALL_HEADERS)
6665
install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}"
67-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}"
66+
DESTINATION include/c++/v1/${dstdir}
6867
COMPONENT cxx-headers
6968
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
7069
)

‎libcxxabi/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ endif()
1010

1111
cmake_minimum_required(VERSION 3.13.4)
1212

13-
include(GNUInstallDirs)
14-
1513
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
1614

1715
# Add path for custom modules
@@ -212,7 +210,7 @@ set(CMAKE_MODULE_PATH
212210
${CMAKE_MODULE_PATH}
213211
)
214212

215-
set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
213+
set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
216214
"Path where built libc++abi runtime libraries should be installed.")
217215

218216
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

‎libunwind/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ endif()
88

99
cmake_minimum_required(VERSION 3.13.4)
1010

11-
include(GNUInstallDirs)
12-
1311
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
1412

1513
# Add path for custom modules
@@ -139,9 +137,9 @@ set(CMAKE_MODULE_PATH
139137
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
140138
${CMAKE_MODULE_PATH})
141139

142-
set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH
140+
set(LIBUNWIND_INSTALL_INCLUDE_DIR include CACHE PATH
143141
"Path where built libunwind headers should be installed.")
144-
set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
142+
set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
145143
"Path where built libunwind runtime libraries should be installed.")
146144

147145
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

‎llvm/cmake/modules/LLVMInstallSymlink.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ include(GNUInstallDirs)
66

77
function(install_symlink name target outdir)
88
set(DESTDIR $ENV{DESTDIR})
9-
GNUInstallDirs_get_absolute_install_dir(bindir "${outdir}" BINDIR)
10-
set(bindir "${DESTDIR}${bindir}")
9+
set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}")
1110

1211
message(STATUS "Creating ${name}")
1312

0 commit comments

Comments
 (0)