[PATCH] D41673: [CMake] Install resource files into a share/ directory

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added reviewers: beanz, vitalybuka, smeenai, fjricci.
Herald added subscribers: Sanitizers, mgorny.

Currently these files are being installed into a root installation
directory, but this triggers an error when the installation directory
is set to an empty string which is often the case when DESTDIR is
used to control the installation destination.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D41673

Files:
  cmake/Modules/AddCompilerRT.cmake
  lib/dfsan/CMakeLists.txt


Index: lib/dfsan/CMakeLists.txt
===================================================================
--- lib/dfsan/CMakeLists.txt
+++ lib/dfsan/CMakeLists.txt
@@ -44,4 +44,4 @@
                    DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt)
 add_dependencies(dfsan dfsan_abilist)
 install(FILES ${dfsan_abilist_filename}
-        DESTINATION ${COMPILER_RT_INSTALL_PATH})
+        DESTINATION ${COMPILER_RT_INSTALL_PATH}/share)
Index: cmake/Modules/AddCompilerRT.cmake
===================================================================
--- cmake/Modules/AddCompilerRT.cmake
+++ cmake/Modules/AddCompilerRT.cmake
@@ -439,7 +439,7 @@
   add_custom_target(${target_name} DEPENDS ${dst_file})
   # Install in Clang resource directory.
   install(FILES ${file_name}
-    DESTINATION ${COMPILER_RT_INSTALL_PATH}
+    DESTINATION ${COMPILER_RT_INSTALL_PATH}/share
     COMPONENT ${component})
   add_dependencies(${component} ${target_name})
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41673.128439.patch
Type: text/x-patch
Size: 946 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180102/b11c7f55/attachment.bin>