[PATCH] D24354: cmake: Use system-obtained OCaml library path when installing

[Michał Górny via llvm-commits]

mgorny created this revision.
mgorny added a reviewer: whitequark.
mgorny added a subscriber: llvm-commits.
Herald added a subscriber: beanz.

Use the OCAML_STDLIB_PATH (determined using 'ocamlfind ocamlc -where') as top install directory for OCaml libraries rather than hardcoded 'lib/ocaml' to account for different OCaml installations. For example, on Gentoo amd64 systems OCaml libraries are installed to 'lib64/ocaml'. The stdlib path method is consistent with other OCaml packages.

Depends on: https://reviews.llvm.org/D24351

https://reviews.llvm.org/D24354

Files:
  cmake/modules/AddOCaml.cmake

Index: cmake/modules/AddOCaml.cmake
===================================================================
--- cmake/modules/AddOCaml.cmake
+++ cmake/modules/AddOCaml.cmake
@@ -193,12 +193,12 @@
   endforeach()
 
   install(FILES ${install_files}
-          DESTINATION lib/ocaml/llvm)
+          DESTINATION "${OCAML_STDLIB_PATH}/llvm")
   install(FILES ${install_shlibs}
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                       GROUP_READ GROUP_EXECUTE
                       WORLD_READ WORLD_EXECUTE
-          DESTINATION lib/ocaml/llvm)
+          DESTINATION "${OCAML_STDLIB_PATH}/llvm")
 
   foreach( install_file ${install_files} ${install_shlibs} )
     get_filename_component(filename "${install_file}" NAME)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24354.70722.patch
Type: text/x-patch
Size: 742 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160908/47599517/attachment.bin>