Skip to content
Snippets Groups Projects
Commit 5180cca4 authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

Merge branch 'stable/cobalt' into stable/nickel

parents 160e6bf2 3783219c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dune-project
+ 1
− 1
View file @ 5180cca4
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"camlp5" "camlp5"
"camlp-streams" "camlp-streams"
("conf-llvm" (>= 11.0.0)) ; note: includes depexts ("conf-llvm" (>= 11.0.0)) ; note: includes depexts
("conf-libclang-cpp" (>= 11.0.0)) ("conf-libclang" (>= 11.0.0))
; conf-libclang-cpp:version should be equal to conf-llvm:version but ; conf-libclang-cpp:version should be equal to conf-llvm:version but
; this can't be enforced through opam dependencies yet ; this can't be enforced through opam dependencies yet
"conf-cmake" ; note: includes depexts "conf-cmake" ; note: includes depexts
......
frama-clang.opam
+ 1
− 1
View file @ 5180cca4
...@@ -8,7 +8,7 @@ depends: [ ...@@ -8,7 +8,7 @@ depends: [
"camlp5" "camlp5"
"camlp-streams" "camlp-streams"
"conf-llvm" {>= "11.0.0"} "conf-llvm" {>= "11.0.0"}
"conf-libclang-cpp" {>= "11.0.0"} "conf-libclang" {>= "11.0.0"}
"conf-cmake" "conf-cmake"
"odoc" {with-doc} "odoc" {with-doc}
] ]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment