[cgma-dev] r5854 - cgm/trunk/cgm_apps/examples/facetdriver

janehu at mcs.anl.gov janehu at mcs.anl.gov
Tue Nov 6 10:44:43 CST 2012


Author: janehu
Date: 2012-11-06 10:44:43 -0600 (Tue, 06 Nov 2012)
New Revision: 5854

Modified:
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
Log:
Fixed for cgm on cubit build, now passed make check under cgm.

Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2012-11-05 23:36:37 UTC (rev 5853)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2012-11-06 16:44:43 UTC (rev 5854)
@@ -13,4 +13,8 @@
                -I$(top_srcdir)/geom/facet \
                -I$(top_srcdir)/geom/facetbool
 
-LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(top_builddir)/geom/Cholla/libCholla.la $(top_builddir)/geom/facet/libcubit_facet.la $(top_builddir)/geom/facetbool/libcubit_facetbool.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la
+if BUILD_CGM
+  LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(top_builddir)/geom/Cholla/libCholla.la $(top_builddir)/geom/facet/libcubit_facet.la $(top_builddir)/geom/facetbool/libcubit_facetbool.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la
+else
+  LDADD = -lcubit_geom -lcubit_util -lcubiti19 $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
+endif



More information about the cgma-dev mailing list