Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/fedora32 has been updated to 7e1cfc4d04fa75068b6deba4f17956630e865af8 (commit) from 1eb31f20c837e1aea4992b66cccaadff623336e8 (commit) https://github.com/fawkesrobotics/fawkes/tree/thofmann/fedora32 Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 7e1cfc4d04fa75068b6deba4f17956630e865af8 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 11:26:07 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 11:26:07 2020 +0200 buildsys: conditionalize CGAL build flags on CGAL version CGAL version >=5 is a header-only library, but older versions need additional flags. Thus, check for the CGAL version by parsing the CGAL version header and conditionally add build flags. https://github.com/fawkesrobotics/fawkes/commit/7e1cfc4d0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- etc/buildsys/cgal.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) - *Diffs* ------------------------------------------------------------- - *commit* 7e1cfc4d04fa75068b6deba4f17956630e865af8 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 11:26:07 2020 +0200 Subject: buildsys: conditionalize CGAL build flags on CGAL version etc/buildsys/cgal.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/etc/buildsys/cgal.mk b/etc/buildsys/cgal.mk index 1cbc63f09..5d3db38d4 100644 --- a/etc/buildsys/cgal.mk +++ b/etc/buildsys/cgal.mk @@ -34,12 +34,24 @@ ifeq ($(CGAL_HAVE_BOOST_LIBS),1) ifneq ($(wildcard $(SYSROOT)/usr/include/mpfr.h $(SYSROOT)/usr/local/include/mpfr.h),) HAVE_CGAL:=1 CFLAGS_CGAL:= -DHAVE_CGAL $(call boost-libs-cflags,$(CGAL_REQ_BOOST_LIBS)) -Wno-deprecated-register - # Disable this runtime check since it fails when using valgrind CFLAGS_CGAL += -DCGAL_DISABLE_ROUNDING_MATH_CHECK + ifneq ($(wildcard $(SYSROOT)/usr/local/include/CGAL/version.h),) + CGAL_VERSION_HEADER=$(SYSROOT)/usr/local/include/CGAL/version.h + else + CGAL_VERSION_HEADER=$(SYSROOT)/usr/include/CGAL/version.h + endif + CGAL_VERSION=$(shell grep -oP "CGAL_VERSION\s+\K.*" $(CGAL_VERSION_HEADER)) + CGAL_VERSION_SPLITTED=$(call split,.,$(CGAL_VERSION)) + CGAL_VERSION_MAJOR=$(word 1,$(CGAL_VERSION_SPLITTED)) + CGAL_VERSION_MINOR=$(word 2,$(CGAL_VERSION_SPLITTED)) + HAVE_CGAL5 = $(if $(call gte,$(CGAL_VERSION_MAJOR),5),1) LDFLAGS_CGAL:=-lgmp -lmpfr -lm \ $(call boost-libs-ldflags,$(REQ_BOOST_LIBS)) + ifneq ($(HAVE_CGAL5),1) + LDFLAGS_CGAL += -lCGAL -lCGAL_Core + endif ifeq ($(CC),clang) CFLAGS_CGAL += -Wno-unused-local-typedef _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
