[PATCH] D24354: cmake: Install the OCaml libraries into a more correct path

[Michał Górny via llvm-commits]

mgorny updated this revision to Diff 70740.
mgorny added a comment.

Updates:

1. extended to cover all 'lib/ocaml' uses,
2. renamed OCAML_INSTALL_PATH to LLVM_OCAML_INSTALL_PATH,
3. moved LLVM_OCAML_INSTALL_PATH to bindings/ocaml since that seems to be the most logical top-level place for it.


https://reviews.llvm.org/D24354

Files:
  bindings/ocaml/CMakeLists.txt
  bindings/ocaml/backends/CMakeLists.txt
  bindings/ocaml/llvm/CMakeLists.txt
  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)
+          DESTINATION "${LLVM_OCAML_INSTALL_PATH}")
   install(FILES ${install_shlibs}
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                       GROUP_READ GROUP_EXECUTE
                       WORLD_READ WORLD_EXECUTE
-          DESTINATION lib/ocaml)
+          DESTINATION "${LLVM_OCAML_INSTALL_PATH}")
 
   foreach( install_file ${install_files} ${install_shlibs} )
     get_filename_component(filename "${install_file}" NAME)
Index: bindings/ocaml/llvm/CMakeLists.txt
===================================================================
--- bindings/ocaml/llvm/CMakeLists.txt
+++ bindings/ocaml/llvm/CMakeLists.txt
@@ -8,4 +8,4 @@
   "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
 
 install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
-        DESTINATION lib/ocaml)
+        DESTINATION "${LLVM_OCAML_INSTALL_PATH}")
Index: bindings/ocaml/backends/CMakeLists.txt
===================================================================
--- bindings/ocaml/backends/CMakeLists.txt
+++ bindings/ocaml/backends/CMakeLists.txt
@@ -23,5 +23,5 @@
     "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
 
   install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
-          DESTINATION lib/ocaml)
+          DESTINATION "${LLVM_OCAML_INSTALL_PATH}")
 endforeach()
Index: bindings/ocaml/CMakeLists.txt
===================================================================
--- bindings/ocaml/CMakeLists.txt
+++ bindings/ocaml/CMakeLists.txt
@@ -1,3 +1,6 @@
+set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}/llvm" CACHE STRING
+    "Install directory for LLVM Ocaml libraries")
+
 add_subdirectory(llvm)
 add_subdirectory(all_backends)
 add_subdirectory(analysis)


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