[Personalrobots-commit] SF.net SVN: personalrobots:[7120] pkg/trunk

[<ge...@us...>]

Revision: 7120
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=7120&view=rev
Author:   gerkey
Date:     2008-11-21 05:38:04 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
Changes for building on OS X

Modified Paths:
--------------
    pkg/trunk/motion_planning/ompl/code/ompl/datastructures/Grid.h
    pkg/trunk/util/profiling_utils/manifest.xml

Modified: pkg/trunk/motion_planning/ompl/code/ompl/datastructures/Grid.h
===================================================================
--- pkg/trunk/motion_planning/ompl/code/ompl/datastructures/Grid.h	2008-11-21 03:39:25 UTC (rev 7119)
+++ pkg/trunk/motion_planning/ompl/code/ompl/datastructures/Grid.h	2008-11-21 05:38:04 UTC (rev 7120)
@@ -40,9 +40,19 @@
 #include <vector>
 
 #ifdef __GNUC__
-#  include <features.h>
+// OS X doesn't have features.h.  Instead we'll just paste in the
+// definition of __GNUC_PREREQ() taken from a Linux version of features.h.
+//#  include <features.h>
+#ifndef __GNUC_PREREQ
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+                ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) 0
+#endif
+#endif
 
-#  if __GNUC_PREREQ(4,0)
+#  if __GNUC_PREREQ(4,1)
 #    include <tr1/unordered_map>
 #    define OMPL_NS_HASH std::tr1
 #    define OMPL_NAME_HASH unordered_map

Modified: pkg/trunk/util/profiling_utils/manifest.xml
===================================================================
--- pkg/trunk/util/profiling_utils/manifest.xml	2008-11-21 03:39:25 UTC (rev 7119)
+++ pkg/trunk/util/profiling_utils/manifest.xml	2008-11-21 05:38:04 UTC (rev 7120)
@@ -14,5 +14,6 @@
 
   <export>
     <cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lprofiling_utils -lpthread -lrt"/>
+    <cpp os="osx" cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lprofiling_utils -lpthread"/>
   </export>
 </package>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.