diff options
Diffstat (limited to 'llvm/cmake')
| -rwxr-xr-x | llvm/cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | llvm/cmake/modules/AddOCaml.cmake | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 06197633568..27bdd72ebcd 100755 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -565,6 +565,7 @@ if(CMAKE_HOST_APPLE AND APPLE) endif() endif() +# Keep the version requirements in sync with bindings/ocaml/README.txt. include(FindOCaml) include(AddOCaml) if(WIN32) diff --git a/llvm/cmake/modules/AddOCaml.cmake b/llvm/cmake/modules/AddOCaml.cmake index e3dd1d84077..4bcd475998c 100644 --- a/llvm/cmake/modules/AddOCaml.cmake +++ b/llvm/cmake/modules/AddOCaml.cmake @@ -170,9 +170,13 @@ function(add_ocaml_library name) add_dependencies("ocaml_${name}" "ocaml_${ocaml_dep}") endforeach() - foreach( llvm_lib ${llvm_libs} ) - add_dependencies("ocaml_${name}" "${llvm_lib}") - endforeach() + if( NOT LLVM_OCAML_OUT_OF_TREE ) + foreach( llvm_lib ${llvm_libs} ) + add_dependencies("ocaml_${name}" "${llvm_lib}") + endforeach() + endif() + + add_dependencies("ocaml_all" "ocaml_${name}") set(install_files) set(install_shlibs) @@ -205,3 +209,5 @@ function(add_ocaml_library name) VERBATIM) endforeach() endfunction() + +add_custom_target("ocaml_all") |
