diff options
| author | Peter Zotov <whitequark@whitequark.org> | 2014-12-30 03:24:07 +0000 |
|---|---|---|
| committer | Peter Zotov <whitequark@whitequark.org> | 2014-12-30 03:24:07 +0000 |
| commit | 0bd44501c3f0eb960f65ab264be5d16f87ac74bb (patch) | |
| tree | 7f2e56b1622525de4bec8cc49833a396eb878215 | |
| parent | aa1c51ee01ce10f70f5b4d9f2101629c57a1c996 (diff) | |
| download | bcm5719-llvm-0bd44501c3f0eb960f65ab264be5d16f87ac74bb.tar.gz bcm5719-llvm-0bd44501c3f0eb960f65ab264be5d16f87ac74bb.zip | |
[OCaml] [cmake] Use LLVM_LIBRARY_DIR instead of LLVM_LIBRARY_OUTPUT_INTDIR.
The latter variable is internal.
Original patch by Ramkumar Ramachandra <artagnon@gmail.com>
llvm-svn: 224977
| -rw-r--r-- | llvm/bindings/ocaml/backends/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | llvm/bindings/ocaml/llvm/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | llvm/cmake/modules/AddOCaml.cmake | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/llvm/bindings/ocaml/backends/CMakeLists.txt b/llvm/bindings/ocaml/backends/CMakeLists.txt index b660c1d66dd..a98063895d7 100644 --- a/llvm/bindings/ocaml/backends/CMakeLists.txt +++ b/llvm/bindings/ocaml/backends/CMakeLists.txt @@ -20,8 +20,8 @@ foreach(TARGET ${LLVM_TARGETS_TO_BUILD}) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/META.llvm_backend.in" - "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/META.llvm_${TARGET}") + "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}") - install(FILES "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/META.llvm_${TARGET}" + install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" DESTINATION lib/ocaml) endforeach() diff --git a/llvm/bindings/ocaml/llvm/CMakeLists.txt b/llvm/bindings/ocaml/llvm/CMakeLists.txt index d1c4ae52736..4956fa4dade 100644 --- a/llvm/bindings/ocaml/llvm/CMakeLists.txt +++ b/llvm/bindings/ocaml/llvm/CMakeLists.txt @@ -5,7 +5,7 @@ add_ocaml_library(llvm configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/META.llvm.in" - "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/META.llvm") + "${LLVM_LIBRARY_DIR}/ocaml/META.llvm") -install(FILES "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/META.llvm" +install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" DESTINATION lib/ocaml) diff --git a/llvm/cmake/modules/AddOCaml.cmake b/llvm/cmake/modules/AddOCaml.cmake index 4babaf68ef9..4473a7dcf17 100644 --- a/llvm/cmake/modules/AddOCaml.cmake +++ b/llvm/cmake/modules/AddOCaml.cmake @@ -52,7 +52,7 @@ function(add_ocaml_library name) "${bin}/${name}${CMAKE_STATIC_LIBRARY_SUFFIX}") endif() - set(ocaml_flags "-lstdc++" "-ldopt" "-L${LLVM_LIBRARY_OUTPUT_INTDIR}" + set(ocaml_flags "-lstdc++" "-ldopt" "-L${LLVM_LIBRARY_DIR}" ${ocaml_pkgs}) foreach( ocaml_dep ${ARG_OCAMLDEP} ) @@ -144,7 +144,7 @@ function(add_ocaml_library name) OUTPUT "${bin}/${name}.odoc" COMMAND "${OCAMLFIND}" "ocamldoc" "-I" "${bin}" - "-I" "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/" + "-I" "${LLVM_LIBRARY_DIR}/ocaml/" "-dump" "${bin}/${name}.odoc" ${ocaml_pkgs} ${ocaml_inputs} DEPENDS ${ocaml_inputs} @@ -192,7 +192,7 @@ function(add_ocaml_library name) get_filename_component(filename "${install_file}" NAME) add_custom_command(TARGET "ocaml_${name}" POST_BUILD COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${install_file}" - "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/" + "${LLVM_LIBRARY_DIR}/ocaml/" COMMENT "Copying OCaml library component ${filename} to intermediate area" VERBATIM) endforeach() |
