Merge 'fix-issue97-yarp-version' into develop, #97

roboticslab-uc3m · May 25, 2017 · 7b5d67b · 7b5d67b
2 parents 7b4ca28 + 8cc04cd
commit 7b5d67b
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/programs/transCoordsUsingJoints/PremultPorts.hpp b/programs/transCoordsUsingJoints/PremultPorts.hpp
@@ -6,7 +6,20 @@
 #include <yarp/os/Port.h>
 #include <yarp/os/BufferedPort.h>
 
+// Temporary fix to avoid https://github.com/roboticslab-uc3m/kinematics-dynamics/issues/97
+// Affects YARP 2.3.68 and 2.3.69-2.3.69.6
+#include <yarp/conf/version.h>
+#define __YARP_VERSION_N (YARP_VERSION_MAJOR * 100000 \
+                          + YARP_VERSION_MINOR * 10000 \
+                          + YARP_VERSION_PATCH * 10)
+#if (YARP_VERSION_TWEAK + 0)  // may be empty
+#define __YARP_VERSION_N (__YARP_VERSION_N + YARP_VERSION_TWEAK)
+#endif
+#if __YARP_VERSION_N == 230680 || (__YARP_VERSION_N >= 230690 && __YARP_VERSION_N <= 230696)
 #include <yarp/dev/api.h>
+#endif
+#undef __YARP_VERSION_N
+
 #include <yarp/dev/IEncoders.h>
 
 #include <kdl/frames.hpp>