[cgma-dev] r5753 - in cgm/trunk: . geom util

[csverma at mcs.anl.gov]

Author: csverma
Date: 2012-09-26 10:00:18 -0500 (Wed, 26 Sep 2012)
New Revision: 5753

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/geom/CubitGeomConfigure.h
   cgm/trunk/util/CubitUtilConfigure.h
Log:
OCC works with freetype2 and new ftgl on Ubuntu12.04

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2012-09-25 18:33:05 UTC (rev 5752)
+++ cgm/trunk/configure.ac	2012-09-26 15:00:18 UTC (rev 5753)
@@ -533,7 +533,7 @@
       AC_LINK_IFELSE(
         [AC_LANG_PROGRAM([#include "Standard_Mutex.hxx"], [Standard_Mutex mutex; mutex.TryLock();])],
         [AC_MSG_RESULT([yes]); OCC_LIBS="$OCC_LIBS -lpthread"],
-        [AC_MSG_ERROR([Cannot link libTKKernel with Standard_Mutex])]
+        [AC_MSG_ERROR([Cannot link libTKernel with Standard_Mutex])]
       )])
   
 

Modified: cgm/trunk/geom/CubitGeomConfigure.h
===================================================================
--- cgm/trunk/geom/CubitGeomConfigure.h	2012-09-25 18:33:05 UTC (rev 5752)
+++ cgm/trunk/geom/CubitGeomConfigure.h	2012-09-26 15:00:18 UTC (rev 5753)
@@ -1 +1,26 @@
+
+#ifndef CUBIT_GEOM_CONFIGURE_H
+#define CUBIT_GEOM_CONFIGURE_H
+
+/* #undef CUBIT_GEOM_BUILD_SHARED_LIBS */
+
+#if defined(CUBIT_GEOM_BUILD_SHARED_LIBS)
+#if defined(cubit_geom_EXPORTS)
+# if defined(WIN32)
+#  define CUBIT_GEOM_EXPORT __declspec(dllexport)
+# elif defined(__GNUC__) && __GNUC__ >= 4
+#  define CUBIT_GEOM_EXPORT __attribute__ ((visibility("default")))
+# endif
+#else
+# if defined(WIN32)
+#  define CUBIT_GEOM_EXPORT __declspec(dllimport)
+# endif
+#endif
+#endif
+
+#ifndef CUBIT_GEOM_EXPORT
 #define CUBIT_GEOM_EXPORT
+#endif
+
+#endif
+

Modified: cgm/trunk/util/CubitUtilConfigure.h
===================================================================
--- cgm/trunk/util/CubitUtilConfigure.h	2012-09-25 18:33:05 UTC (rev 5752)
+++ cgm/trunk/util/CubitUtilConfigure.h	2012-09-26 15:00:18 UTC (rev 5753)
@@ -1 +1,26 @@