Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frama-c
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

87773f21

Commit 87773f21 authored 3 years ago by Virgile Prevosto

Downloads
- Plain Diff

Merge branch 'fix/andre/cpp-with-jcdb-subdir' into 'master'

Fix/andre/cpp with jcdb subdir

See merge request frama-c/frama-c!3124

parents 9408b551 710c8473

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Makefile.generating 6 additions, 6 deletions

Makefile.generating
src/kernel_services/ast_queries/file.ml 21 additions, 8 deletions

src/kernel_services/ast_queries/file.ml
src/kernel_services/cmdline_parameters/cmdline.ml 3 additions, 3 deletions

src/kernel_services/cmdline_parameters/cmdline.ml
tests/jcdb/compile_commands.json 3 additions, 3 deletions

tests/jcdb/compile_commands.json
tests/jcdb/oracle/subdir.err 0 additions, 0 deletions

tests/jcdb/oracle/subdir.err
tests/jcdb/oracle/subdir.res 1 addition, 0 deletions

tests/jcdb/oracle/subdir.res
tests/jcdb/subdir.c 13 additions, 0 deletions

tests/jcdb/subdir.c
tests/jcdb/subdir.json 6 additions, 0 deletions

tests/jcdb/subdir.json
tests/jcdb/subdir1/header.h 1 addition, 0 deletions

tests/jcdb/subdir1/header.h
tests/jcdb/subdir2/included.h 3 additions, 0 deletions

tests/jcdb/subdir2/included.h

with 57 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment