[Fawkes Git] branch/timn/robotino-direct: robotino: C++11 is a mandatory requirement

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Apr 13 13:23:52 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, timn/robotino-direct has been updated
        to  599b51a644df68d4347316df55bdbd4270f41e98 (commit)
      from  0e758a742bf54eb4e85479bb5282c30229c9efd1 (commit)

http://git.fawkesrobotics.org/fawkes.git/timn/robotino-direct

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 599b51a644df68d4347316df55bdbd4270f41e98
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Apr 13 13:23:36 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Apr 13 13:23:36 2016 +0200

    robotino: C++11 is a mandatory requirement

http://git.fawkesrobotics.org/fawkes.git/commit/599b51a
http://trac.fawkesrobotics.org/changeset/599b51a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/plugins/robotino/Makefile |   48 ++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 22 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 599b51a644df68d4347316df55bdbd4270f41e98 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Apr 13 13:23:36 2016 +0200
Subject: robotino: C++11 is a mandatory requirement

 src/plugins/robotino/Makefile |   48 ++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/robotino/Makefile b/src/plugins/robotino/Makefile
index 0374f77..a8fc65e 100644
--- a/src/plugins/robotino/Makefile
+++ b/src/plugins/robotino/Makefile
@@ -50,7 +50,7 @@ else
   WARN_TARGETS += warning_openrobotino
 endif
 
-ifeq ($(HAVE_LIBUDEV)$(HAVE_ROBOTINO_DIRECT_BOOST_LIBS)$(call boost-version-atleast,1,0,48)$(HAVE_CPP11),1111)
+ifeq ($(HAVE_LIBUDEV)$(HAVE_ROBOTINO_DIRECT_BOOST_LIBS)$(call boost-version-atleast,1,0,48),111)
 	HAVE_ROBOTINO_DIRECT = 1
 
   CFLAGS += -DHAVE_ROBOTINO_DIRECT $(CFLAGS_CPP11) $(CFLAGS_LIBUDEV) $(CFLAGS_ROBOTINO_DIRECT_BOOST)
@@ -68,34 +68,38 @@ else
   ifneq ($(call boost-version-atleast,1,0,48),1)
     WARN_TARGETS += warning_old_boost
   endif
-  ifneq ($(HAVE_CPP11),1)
-    WARN_TARGETS += warning_cpp11
-  endif
 endif
 
 ifneq ($(HAVE_OPENROBOTINO)$(HAVE_ROBOTINO_DIRECT),)
-  CFLAGS_sensor_thread = $(CFLAGS) -Wno-reorder -Wno-unused-function
-
-  ifeq ($(HAVE_TF),1)
-    CFLAGS_robotino_plugin  = $(CFLAGS) $(CFLAGS_TF)
-    CFLAGS_act_thread       = $(CFLAGS_robotino_plugin)
-    CFLAGS_sensor_thread   += $(CFLAGS) $(CFLAGS_TF)
-    CFLAGS_openrobotino_com_thread      += $(CFLAGS) $(CFLAGS_TF)
-    CFLAGS_direct_com_thread      += $(CFLAGS) $(CFLAGS_TF)
-    LDFLAGS_robotino += $(LDFLAGS_TF)
-    LIBS_robotino    += fawkestf
-  endif
+  ifeq ($(HAVE_CPP11),1)
+
+    CFLAGS += $(CFLAGS_CPP11)
 
-  PLUGINS_all = $(PLUGINDIR)/robotino.so
+    CFLAGS_sensor_thread = $(CFLAGS) -Wno-reorder -Wno-unused-function
 
-  ifeq ($(HAVE_PCL),1)
-    CFLAGS_robotino_ir_pcl_plugin = $(CFLAGS) $(CFLAGS_PCL) $(CFLAGS_TF)
-    CFLAGS_ir_pcl_thread = $(CFLAGS_robotino_ir_pcl_plugin)
-    LDFLAGS_robotino_ir_pcl += $(LDFLAGS_PCL) $(LDFLAGS_TF)
+    ifeq ($(HAVE_TF),1)
+      CFLAGS_robotino_plugin  = $(CFLAGS) $(CFLAGS_TF)
+      CFLAGS_act_thread       = $(CFLAGS_robotino_plugin)
+      CFLAGS_sensor_thread   += $(CFLAGS) $(CFLAGS_TF)
+      CFLAGS_openrobotino_com_thread      += $(CFLAGS) $(CFLAGS_TF)
+      CFLAGS_direct_com_thread      += $(CFLAGS) $(CFLAGS_TF)
+      LDFLAGS_robotino += $(LDFLAGS_TF)
+      LIBS_robotino    += fawkestf
+    endif
 
-    PLUGINS_all += $(PLUGINDIR)/robotino-ir-pcl.$(SOEXT)
+    PLUGINS_all = $(PLUGINDIR)/robotino.so
+
+    ifeq ($(HAVE_PCL),1)
+      CFLAGS_robotino_ir_pcl_plugin = $(CFLAGS) $(CFLAGS_PCL) $(CFLAGS_TF)
+      CFLAGS_ir_pcl_thread = $(CFLAGS_robotino_ir_pcl_plugin)
+      LDFLAGS_robotino_ir_pcl += $(LDFLAGS_PCL) $(LDFLAGS_TF)
+
+      PLUGINS_all += $(PLUGINDIR)/robotino-ir-pcl.$(SOEXT)
+    else
+      WARN_TARGETS += warning_pcl
+    endif
   else
-    WARN_TARGETS += warning_pcl
+    WARN_TARGETS += warning_cpp11
   endif
 else
   WARN_TARGETS += warning_nodriver




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list