diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-03-20 11:20:46 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-03-20 11:20:46 +0100 |
| commit | 1044332131498907bde76400638cfb42b9e4199d (patch) | |
| tree | a84800b931aeb6f2c5fa83fe5db3b8cbf7f40823 /build/linux/Makefile.in | |
| parent | d1ad446669cea2a76d7146023e4862a1fdbf3e13 (diff) | |
| parent | 2d55fd38b4a8ef5076c0591ae4147f81c1107ee3 (diff) | |
| download | astra-1044332131498907bde76400638cfb42b9e4199d.tar.gz astra-1044332131498907bde76400638cfb42b9e4199d.tar.bz2 astra-1044332131498907bde76400638cfb42b9e4199d.tar.xz astra-1044332131498907bde76400638cfb42b9e4199d.zip | |
Merge branch 'master' into logging
Diffstat (limited to 'build/linux/Makefile.in')
| -rw-r--r-- | build/linux/Makefile.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 49220df..0dfa15a 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@ @@ -32,6 +33,8 @@ CXXFLAGS+=-g -O3 -Wall -Wshadow LIBS+=-lpthread LDFLAGS+=-g +CPPFLAGS+=@CPPFLAGS_OS@ + ifeq ($(cuda),yes) CPPFLAGS += @CPPFLAGS_CUDA@ -DASTRA_CUDA NVCCFLAGS = @NVCCFLAGS@ @CPPFLAGS_CUDA@ -I../.. -I../../include -DASTRA_CUDA @@ -57,6 +60,8 @@ endif BOOST_CPPFLAGS= BOOST_LDFLAGS= +BOOSTUTF_LIBS=@LIBS_BOOSTUTF@ + CPPFLAGS+=$(BOOST_CPPFLAGS) LDFLAGS+=$(BOOST_LDFLAGS) @@ -290,11 +295,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 |