Skip to content

Commit 28e665f

Browse files
committed
[cmake] Slight fix ups to make robust to the full range of GNUInstallDirs
See https://cmake.org/cmake/help/v3.14/module/GNUInstallDirs.html#result-variables for `CMAKE_INSTALL_FULL_*` Reviewed By: sebastian-ne Differential Revision: https://reviews.llvm.org/D130545
1 parent 0a412b3 commit 28e665f

File tree

5 files changed

+23
-10
lines changed

5 files changed

+23
-10
lines changed

clang/tools/clang-linker-wrapper/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include(GNUInstallDirs)
2+
13
set(LLVM_LINK_COMPONENTS
24
${LLVM_TARGETS_TO_BUILD}
35
BitWriter
@@ -42,4 +44,4 @@ target_link_libraries(clang-linker-wrapper
4244
${CLANG_LINKER_WRAPPER_LIB_DEPS}
4345
)
4446

45-
install(TARGETS clang-linker-wrapper RUNTIME DESTINATION bin)
47+
install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

llvm-libgcc/lib/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include(CheckLibraryExists)
22
include(GNUInstallDirs)
3+
include(ExtendPath)
34

45
string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
56

@@ -41,13 +42,13 @@ target_link_libraries(libgcc_s PRIVATE
4142
c
4243
)
4344

44-
get_filename_component(LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${CMAKE_INSTALL_PREFIX}/${LIBUNWIND_INSTALL_LIBRARY_DIR}" ABSOLUTE)
45+
extend_path(LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${CMAKE_INSTALL_PREFIX}" "${LIBUNWIND_INSTALL_LIBRARY_DIR}")
4546
#string(REPLACE "${CMAKE_INSTALL_FULL_LIBDIR}/" "" LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}")
4647

4748
install(TARGETS libgcc_s
4849
LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
4950
ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
50-
RUNTIME DESTINATION bin COMPONENT unwind)
51+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind)
5152

5253
get_compiler_rt_install_dir(${LLVM_LIBGCC_TARGET_ARCH} install_dir_builtins)
5354
string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")

llvm/cmake/modules/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ list(REMOVE_DUPLICATES LLVM_CONFIG_LIBRARY_DIRS)
137137

138138
set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}")
139139
extend_path(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}" "${LLVM_INSTALL_PACKAGE_DIR}")
140+
extend_path(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}" "${LLVM_TOOLS_INSTALL_DIR}")
140141

141142
# Generate a default location for lit
142143
if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)

openmp/CMakeLists.txt

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

3-
# Add cmake directory to search for custom cmake functions.
4-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
3+
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
4+
5+
# Add path for custom modules
6+
list(INSERT CMAKE_MODULE_PATH 0
7+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
8+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
9+
)
510

611
# llvm/runtimes/ will set OPENMP_STANDALONE_BUILD.
712
if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

openmp/runtime/src/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#//===----------------------------------------------------------------------===//
99
#
1010

11+
include(ExtendPath)
12+
1113
# Configure omp.h, kmp_config.h and omp-tools.h if necessary
1214
configure_file(${LIBOMP_INC_DIR}/omp.h.var omp.h @ONLY)
1315
configure_file(kmp_config.h.cmake kmp_config.h @ONLY)
@@ -347,8 +349,8 @@ endif()
347349
add_dependencies(libomp-micro-tests libomp-test-deps)
348350

349351
# Install rules
350-
# We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib
351-
# We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include
352+
# We want to install libomp in ${DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}
353+
# We want to install headers in ${DESTDIR}/${CMAKE_INSTALL_FULL_INCLUDEDIR}
352354
if(${OPENMP_STANDALONE_BUILD})
353355
set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}")
354356
else()
@@ -362,9 +364,10 @@ if(WIN32)
362364
set(LIBOMP_ALIASES "libiomp5md")
363365
foreach(alias IN LISTS LIBOMP_ALIASES)
364366
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\"
365-
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}\")")
367+
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${CMAKE_INSTALL_FULL_BINDIR}\")")
368+
extend_path(outdir "${CMAKE_INSTALL_PREFIX}" "${OPENMP_INSTALL_LIBDIR}")
366369
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\"
367-
\"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")")
370+
\"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${outdir}\")")
368371
endforeach()
369372
else()
370373

@@ -374,9 +377,10 @@ else()
374377
# Create aliases (symlinks) of the library for backwards compatibility
375378
set(LIBOMP_ALIASES "libgomp;libiomp5")
376379
foreach(alias IN LISTS LIBOMP_ALIASES)
380+
extend_path(outdir "${CMAKE_INSTALL_PREFIX}" "${OPENMP_INSTALL_LIBDIR}")
377381
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
378382
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
379-
\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")")
383+
\"\$ENV{DESTDIR}\${outdir}\")")
380384
endforeach()
381385
endif()
382386
endif()

0 commit comments

Comments
 (0)