From 20f329a7a38cd02586ef305d551d288ebcf39501 Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Wed, 4 Mar 2015 13:44:03 +0100
Subject: Also clean up generated Cython files during `make clean`
---
build/linux/Makefile.in | 2 ++
1 file changed, 2 insertions(+)
(limited to 'build/linux')
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index cd5e74b..92697b2 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -303,6 +303,8 @@ clean:
rm -f $(TEST_OBJECTS) test.bin
rm -fr ../../python/finalbuild/
rm -fr ../../python/build/
+ rm -f ../../python/astra/*.cpp
+ rm -f ../../python/astra/*.c
distclean: clean
rm -f config.guess config.sub ltmain.sh libtool install-sh
--
cgit v1.2.3
From 8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <d.m.pelt@cwi.nl>
Date: Thu, 5 Mar 2015 12:22:52 +0100
Subject: Force clang to use libstdc++ on OSX (fixes Cython compilation)
---
build/linux/Makefile.in | 2 ++
build/linux/configure.ac | 13 +++++++++++++
2 files changed, 15 insertions(+)
(limited to 'build/linux')
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 92697b2..2d62a17 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -32,6 +32,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
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index b97a7a0..129079c 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -208,6 +208,19 @@ fi
AC_SUBST(HAVEPYTHON)
+#OS specific setup
+AC_CANONICAL_HOST
+case $host_os in
+ darwin* )
+ CPPFLAGS_OS="-stdlib=libstdc++ -mmacosx-version-min=10.6"
+ ;;
+ *)
+ CPPFLAGS_OS=""
+ ;;
+esac
+
+AC_SUBST(CPPFLAGS_OS)
+
# TODO:
--
cgit v1.2.3
From c58a0f821cf494741e039d4b56aabb7a9ffe85bf Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Fri, 6 Mar 2015 21:23:19 +0100
Subject: Make boost-unit-test-framework optional in configure
---
build/linux/Makefile.in | 10 +++++++++-
build/linux/configure.ac | 7 ++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
(limited to 'build/linux')
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
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 129079c..6558445 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -53,20 +53,25 @@ AC_CHECK_HEADER(iostream, , AC_MSG_ERROR([No working c++ compiler found]))
AC_MSG_CHECKING([for boost-unit-test-framework])
ASTRA_CHECK_BOOST_UNIT_TEST_FRAMEWORK(-lboost_unit_test_framework-mt, BOOSTUTF=yes_mt, BOOSTUTF=no)
+HAVEBOOSTUTF=no
if test x$BOOSTUTF = xno; then
ASTRA_CHECK_BOOST_UNIT_TEST_FRAMEWORK(-lboost_unit_test_framework, BOOSTUTF=yes, BOOSTUTF=no)
if test x$BOOSTUTF = xno; then
AC_MSG_RESULT(no)
- AC_MSG_ERROR([No boost-unit-test-framework library found])
else
AC_MSG_RESULT([yes, libboost_unit_test_framework])
LIBS_BOOSTUTF="-lboost_unit_test_framework"
+ HAVEBOOSTUTF=yes
fi
else
AC_MSG_RESULT([yes, libboost_unit_test_framework-mt])
LIBS_BOOSTUTF="-lboost_unit_test_framework-mt"
+ HAVEBOOSTUTF=yes
fi
+AC_SUBST(HAVEBOOSTUTF)
+AC_SUBST(LIBS_BOOSTUTF)
+
# nvcc, cuda
--
cgit v1.2.3
From 30208e988315c8f576da6848cdc3236413c0cd10 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 9 Mar 2015 18:12:37 +0100
Subject: Add check for required boost headers
---
build/linux/configure.ac | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'build/linux')
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 6558445..d9e1f1a 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -72,6 +72,17 @@ fi
AC_SUBST(HAVEBOOSTUTF)
AC_SUBST(LIBS_BOOSTUTF)
+BOOSTok=yes
+AC_CHECK_HEADER([boost/lexical_cast.hpp],[],[BOOSTok=no],[])
+AC_CHECK_HEADER([boost/any.hpp],[],[BOOSTok=no],[])
+dnl AC_CHECK_HEADER([boost/thread.hpp],[],[BOOSTok=no],[])
+dnl AC_CHECK_HEADER([boost/bind.hpp],[],[BOOSTok=no],[])
+AC_CHECK_HEADER([boost/static_assert.hpp],[],[BOOSTok=no],[])
+AC_CHECK_HEADER([boost/throw_exception.hpp],[],[BOOSTok=no],[])
+
+if test x$BOOSTok = xno; then
+ AC_MSG_ERROR([boost not found])
+fi
# nvcc, cuda
--
cgit v1.2.3