6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-22 23:24:59 +00:00
Code Issues Projects Releases Wiki Activity

[OCaml] [cmake] Use LLVM_LIBRARY_DIR instead of LLVM_LIBRARY_OUTPUT_INTDIR.

Browse Source 
The latter variable is internal.

Original patch by Ramkumar Ramachandra <artagnon@gmail.com>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224977 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Zotov
2014-12-30 03:24:07 +00:00
parent f8207ac705
commit a2cb627a04
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/ocaml/backends/CMakeLists.txt
View File

@@ -20,8 +20,8 @@ foreach(TARGET ${LLVM_TARGETS_TO_BUILD})
configure_file( configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/META.llvm_backend.in" "${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) DESTINATION lib/ocaml)
endforeach() endforeach()

4
bindings/ocaml/llvm/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ add_ocaml_library(llvm
configure_file( configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/META.llvm.in" "${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) DESTINATION lib/ocaml)

6
cmake/modules/AddOCaml.cmake
View File

@@ -52,7 +52,7 @@ function(add_ocaml_library name)
"${bin}/${name}${CMAKE_STATIC_LIBRARY_SUFFIX}") "${bin}/${name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
endif() endif()
set(ocaml_flags "-lstdc++" "-ldopt" "-L${LLVM_LIBRARY_OUTPUT_INTDIR}" set(ocaml_flags "-lstdc++" "-ldopt" "-L${LLVM_LIBRARY_DIR}"
${ocaml_pkgs}) ${ocaml_pkgs})
foreach( ocaml_dep ${ARG_OCAMLDEP} ) foreach( ocaml_dep ${ARG_OCAMLDEP} )
@@ -144,7 +144,7 @@ function(add_ocaml_library name)
OUTPUT "${bin}/${name}.odoc" OUTPUT "${bin}/${name}.odoc"
COMMAND "${OCAMLFIND}" "ocamldoc" COMMAND "${OCAMLFIND}" "ocamldoc"
"-I" "${bin}" "-I" "${bin}"
"-I" "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/" "-I" "${LLVM_LIBRARY_DIR}/ocaml/"
"-dump" "${bin}/${name}.odoc" "-dump" "${bin}/${name}.odoc"
${ocaml_pkgs} ${ocaml_inputs} ${ocaml_pkgs} ${ocaml_inputs}
DEPENDS ${ocaml_inputs} DEPENDS ${ocaml_inputs}
@@ -192,7 +192,7 @@ function(add_ocaml_library name)
get_filename_component(filename "${install_file}" NAME) get_filename_component(filename "${install_file}" NAME)
add_custom_command(TARGET "ocaml_${name}" POST_BUILD add_custom_command(TARGET "ocaml_${name}" POST_BUILD
COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${install_file}" 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" COMMENT "Copying OCaml library component ${filename} to intermediate area"
VERBATIM) VERBATIM)
endforeach() endforeach()