Project

General

Profile

« Previous | Next » 

Revision a1230f68

Added by Pierre-Loïc Garoche over 5 years ago

Solved issues with configure and ocaml libs dependencies

View differences:

Makefile.in
8 8
LUSI_MPFR_LIB=include/mpfr_lustre.lusi
9 9
LOCAL_BINDIR=bin
10 10
LOCAL_DOCDIR=doc/manual
11
BIN_TARGETS = lustrec lustret lustresf
11
BIN_TARGETS = lustrec lustret @lustresf_target@
12 12

  
13 13
DEFAULT_TEST_TARGET=COMPIL_LUS\|MAKE\|BIN\|DIFF
14
DEFAULT_EXCLUDE_TEST=LUSTRET
14 15

  
15
all: lustrec lustret
16
all: $(BIN_TARGETS)
16 17

  
17 18
lustrec:
18 19
	@echo Compiling binary lustrec
......
96 97
	fi
97 98

  
98 99
test-no-submit: test-config
99
	cd test; ctest -M Experimental -T Start -T Update -T Configure -T Build -T Test -R ${DEFAULT_TEST_TARGET}
100
	cd test; ctest -M Experimental -T Start -T Update -T Configure -T Build -T Test -R ${DEFAULT_TEST_TARGET} -E ${DEFAULT_EXCLUDE_TEST}
100 101

  
101 102
test-submit: test-config
102
	cd test; ctest -M Experimental -T Submit -R ${DEFAULT_TEST_TARGET}
103
	cd test; ctest -M Experimental -T Submit -R ${DEFAULT_TEST_TARGET} -E ${DEFAULT_EXCLUDE_TEST}
104

  
103 105

  
104 106
test: test-config
105
	cd test; ctest -D Experimental -R ${DEFAULT_TEST_TARGET}
107
	cd test; ctest -D Experimental -R ${DEFAULT_TEST_TARGET} -E ${DEFAULT_EXCLUDE_TEST}
108

  
106 109

  
107 110
test-full-no-submit: test-config
108 111
	cd test; ctest -M Experimental -T Start -T Update -T Configure -T Build -T Test
configure.ac
55 55

  
56 56
# Checks for libraries.
57 57
# OCamlgraph
58
AC_MSG_CHECKING(ocamlgraph library)
59
AS_IF([ocamlfind query ocamlgraph >/dev/null 2>&1],
60
    [],[AC_MSG_ERROR(ocamlgraph required. opam install ocamlgraph should solve the issue)],
61
)
62
AC_MSG_RESULT(yes)
63

  
64
# logging and command line librairies
65
AC_MSG_CHECKING(cmdliner library)
66
AS_IF([ocamlfind query cmdliner >/dev/null 2>&1],
67
    [],[AC_MSG_ERROR(cmdliner required. opam install cmdliner should solve the issue)],
68
)
69
AC_MSG_RESULT(yes)
70

  
71
AC_MSG_CHECKING(fmt and logs library)
72
AS_IF([ocamlfind query fmt logs >/dev/null 2>&1],
73
    [],[AC_MSG_ERROR(fmt and logs required. opam install fmt logs should solve the issue)],
58
AC_MSG_CHECKING(ocaml libraries required)
59
AS_IF([ocamlfind query ocamlgraph cmdliner fmt logs num >/dev/null 2>&1],
60
    [],[AC_MSG_ERROR(A few ocaml library required. opam install ocamlgraph cmdliner fmt logs num should solve the issue)],
74 61
)
75 62
AC_MSG_RESULT(yes)
76 63

  
77 64
#Yojson
78
AC_MSG_CHECKING(yojson library)
65
AC_MSG_CHECKING(yojson library (optional))
79 66
AS_IF([ocamlfind query yojson >/dev/null 2>&1],
80 67
    [yojson=yes; AC_MSG_RESULT(yes)],[yojson=no; AC_MSG_WARN(Yojson required for lustresf. opam install yojson should solve the issue)],
81 68
)
......
120 107
AS_IF([test "x$enable_lustresf" != "xno" -a "x$yojson" = "xyes"], [
121 108
  lustresf=Makefile-lustresf.in
122 109
  lustresf_src=src/Makefile-lustresf.in
110
  AC_SUBST(lustresf_target, "lustresf")
123 111
])
124 112

  
125 113
# Checking availability of path to regression tests

Also available in: Unified diff