[cgma-dev] r5851 - cgm/trunk/itaps

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-11-02 12:40:36 -0500 (Fri, 02 Nov 2012)
New Revision: 5851

Modified:
   cgm/trunk/itaps/Makefile.am
   cgm/trunk/itaps/testgeom.cc
Log:
Fixed the configure problem for cgm on cubit13.1, now, besides cubit13.1 library's get_graphics function not working, which is commented out for now, both testcases are passing in itaps directory for make check.

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2012-11-02 17:22:55 UTC (rev 5850)
+++ cgm/trunk/itaps/Makefile.am	2012-11-02 17:40:36 UTC (rev 5851)
@@ -25,7 +25,11 @@
 
 libiGeom_la_includedir = $(includedir)
 
-libiGeom_la_LIBADD = $(top_builddir)/libcgm.la
+if BUILD_CGM
+  libiGeom_la_LIBADD = $(top_builddir)/libcgm.la
+else
+  libiGeom_la_LIBADD = -lcubiti19 -lcubit_geom -lcubit_util $(top_builddir)/init/libcgma_init.la $(top_builddir)/geom/libcubit_geom.la
+endif 
 
 AM_CPPFLAGS += $(HAVE_ACIS_DEF) \
                $(HAVE_OCC_DEF) \
@@ -44,13 +48,13 @@
 	CATag.cpp \
 	iGeom_CGMA.cc \
 	iGeomError.cc \
-	iGeomError.h 
+	iGeomError.h  
 
 libiGeom_la_include_HEADERS = \
 	iBase.h \
 	iGeom_FCDefs.h \
 	iGeom_protos.h \
-	iBase_f.h
+	iBase_f.h 
 
 if ITAPS_SHIM
   AM_CPPFLAGS += -DITAPS_SHIM
@@ -66,8 +70,13 @@
 
 check_PROGRAMS = chaman $(TESTS)
 
-LDADD = libiGeom.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la
-AM_LDFLAGS += $(CGM_EXT_LTFLAGS) $(CGM_EXT_LDFLAGS)
+if BUILD_CGM
+  LDADD = libiGeom.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la
+else
+  LDADD = libiGeom.la
+endif
+
+AM_LDFLAGS +=  $(CGM_EXT_LTFLAGS) $(CGM_EXT_LDFLAGS)
 testgeom_SOURCES = testgeom.cc
 testgeom_occ_SOURCES = $(testgeom_SOURCES)
 testgeom_occ_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) -DFORCE_OCC

Modified: cgm/trunk/itaps/testgeom.cc