tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / git / openmp / gnu-install-dirs.patch
at 22.05 89 lines 4.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 7f11a05f5622..fb90f8f6a49b 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S 6 set(OPENMP_STANDALONE_BUILD TRUE) 7 project(openmp C CXX) 8 9+ include(GNUInstallDirs) 10+ 11 # CMAKE_BUILD_TYPE was not set, default to Release. 12 if (NOT CMAKE_BUILD_TYPE) 13 set(CMAKE_BUILD_TYPE Release) 14@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S 15 set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING 16 "Suffix of lib installation directory, e.g. 64 => lib64") 17 # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. 18- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") 19+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") 20 21 # Group test settings. 22 set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING 23@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S 24 else() 25 set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) 26 # If building in tree, we honor the same install suffix LLVM uses. 27- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") 28+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") 29 30 if (NOT MSVC) 31 set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) 32index 0e1ce2afd154..8b3810f83713 100644 33--- a/libomptarget/plugins/amdgpu/CMakeLists.txt 34+++ b/libomptarget/plugins/amdgpu/CMakeLists.txt 35@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED 36 37 # Install plugin under the lib destination folder. 38 # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug 39-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") 40+install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") 41 set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) 42 43 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") 44diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt 45index 16ce0891ca23..db30ee9c769f 100644 46--- a/libomptarget/plugins/ve/CMakeLists.txt 47+++ b/libomptarget/plugins/ve/CMakeLists.txt 48@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) 49 50 # Install plugin under the lib destination folder. 51 install(TARGETS "omptarget.rtl.${tmachine_libname}" 52- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) 53+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) 54 55 target_link_libraries( 56 "omptarget.rtl.${tmachine_libname}" 57diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt 58index e4f4e6e1e73f..1164b3b22b0e 100644 59--- a/runtime/src/CMakeLists.txt 60+++ b/runtime/src/CMakeLists.txt 61@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) 62 # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib 63 # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include 64 if(${OPENMP_STANDALONE_BUILD}) 65- set(LIBOMP_HEADERS_INSTALL_PATH include) 66+ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") 67 else() 68 string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) 69 set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") 70 endif() 71 if(WIN32) 72- install(TARGETS omp RUNTIME DESTINATION bin) 73+ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 74 install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") 75 # Create aliases (regular copies) of the library for backwards compatibility 76 set(LIBOMP_ALIASES "libiomp5md") 77diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt 78index 64317c112176..4002784da736 100644 79--- a/tools/multiplex/CMakeLists.txt 80+++ b/tools/multiplex/CMakeLists.txt 81@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) 82 add_library(ompt-multiplex INTERFACE) 83 target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) 84 85- install(FILES ompt-multiplex.h DESTINATION include) 86+ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 87 88 add_subdirectory(tests) 89 endif()