diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-03-10 10:44:20 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-03-10 10:44:20 +0100 |
| commit | 65a607967e71d68ec32f34b7cf61fd8d891cc550 (patch) | |
| tree | efdd9125e3c12c8ce000b4db3c812bce6ce8e296 /build/linux/Makefile.in | |
| parent | 8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc (diff) | |
| parent | 30208e988315c8f576da6848cdc3236413c0cd10 (diff) | |
| download | astra-65a607967e71d68ec32f34b7cf61fd8d891cc550.tar.gz astra-65a607967e71d68ec32f34b7cf61fd8d891cc550.tar.bz2 astra-65a607967e71d68ec32f34b7cf61fd8d891cc550.tar.xz astra-65a607967e71d68ec32f34b7cf61fd8d891cc550.zip | |
Merge pull request #29 from wjp/optional_boostutf
Improve configure checks for boost
Diffstat (limited to 'build/linux/Makefile.in')
| -rw-r--r-- | build/linux/Makefile.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 2d62a17..f647299 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -1,6 +1,7 @@ cuda=@HAVECUDA@ matlab=@HAVEMATLAB@ python=@HAVEPYTHON@ +boostutf=@HAVEBOOSTUTF@ MATLAB_ROOT=@MATLAB_ROOT@ @@ -59,6 +60,8 @@ endif BOOST_CPPFLAGS= BOOST_LDFLAGS= +BOOSTUTF_LIBS=@LIBS_BOOSTUTF@ + CPPFLAGS+=$(BOOST_CPPFLAGS) LDFLAGS+=$(BOOST_LDFLAGS) @@ -290,11 +293,16 @@ ifeq ($(cuda),yes) @rm -f $(*F).linkinfo endif +ifeq ($(boostutf),yes) test.bin: $(ALL_OBJECTS) $(TEST_OBJECTS) - ./libtool --mode=link $(LD) -o $@ $(LDFLAGS) $(LIBS) $+ -lboost_unit_test_framework + ./libtool --mode=link $(LD) -o $@ $(LDFLAGS) $+ $(LIBS) $(BOOSTUTF_LIBS) test: test.bin ./test.bin +else +test: + @echo "Tests have been disabled by configure" +endif clean: rm -f $(MATLAB_MEX) libastra.la |