diff options
| author | Michał Górny <mgorny@moritz.systems> | 2022-02-06 15:58:32 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@moritz.systems> | 2022-02-12 13:45:17 +0100 |
| commit | 919dba9248f63d50e679ad5741d99ed8a8047227 (patch) | |
| tree | 889b91f0bca60a5e7e8caf2d32c91b5a4415123e | |
| parent | 0dd49a5628bbe01cecf6516017da59ae44863ab3 (diff) | |
[llvm] [cmake] Fix finding modern ounit2
Apparently modern versions of ounit2 can only be found as "ounit2"
rather than "oUnit" version 2. Update the CMake check to support both
variants. This makes the OCaml tests run again with ounit2-2.2.4.
Differential Revision: https://reviews.llvm.org/D119079
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index a138d372d3b2..c70b8b3787a0 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -650,7 +650,12 @@ else() find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL) if( HAVE_OCAML_CTYPES ) message(STATUS "OCaml bindings enabled.") - find_ocamlfind_package(oUnit VERSION 2 OPTIONAL) + find_ocamlfind_package(ounit2 OPTIONAL) + if ( HAVE_OCAML_OUNIT2 ) + set(HAVE_OCAML_OUNIT TRUE) + else() + find_ocamlfind_package(oUnit VERSION 2 OPTIONAL) + endif() set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml") set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING |