[cgma-dev] r2199 - in cgm/trunk: . geom init test

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-11-03 10:25:01 -0600 (Mon, 03 Nov 2008)
New Revision: 2199

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/configure.in
   cgm/trunk/geom/Makefile.am
   cgm/trunk/init/Makefile.am
   cgm/trunk/test/Makefile.am
Log:
- changed 'WITH_OCC' to 'build_OCC' to make consistent with ACIS
- added geom/OCC to list of include dirs in init code; also added $(OCC_INC_FLAG); this is inconsistent with ACIS handling, because OQE/OME headers include OCC headers; is this absolutely necessary?


Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
+++ cgm/trunk/Makefile.am	2008-11-03 16:25:01 UTC (rev 2199)
@@ -23,7 +23,7 @@
 else
   CGM_ACIS_LIB = 
 endif
-if WITH_OCC
+if build_OCC
   CGM_OCC_LIB = geom/OCC/libcubit_OCC.la
 else
   CGM_OCC_LIB =

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-11-03 15:57:27 UTC (rev 2198)
+++ cgm/trunk/configure.in	2008-11-03 16:25:01 UTC (rev 2199)
@@ -386,8 +386,8 @@
 AC_SUBST(CGM_EXT_LTFLAGS)
 AC_SUBST(CGM_EXT_INCLUDE)
 
-# Allow "if WITH_OCC" in Makefile.am
-AM_CONDITIONAL( WITH_OCC, [test "x$occ_DIR" != "xno"] )
+# Allow "if build_OCC" in Makefile.am
+AM_CONDITIONAL( build_OCC, [test "x$occ_DIR" != "xno"] )
 
 
 ################################################################################

Modified: cgm/trunk/geom/Makefile.am
===================================================================
--- cgm/trunk/geom/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
+++ cgm/trunk/geom/Makefile.am	2008-11-03 16:25:01 UTC (rev 2199)
@@ -11,7 +11,7 @@
 if build_parallel
   SUBDIRS += parallel
 endif
-if WITH_OCC
+if build_OCC
   SUBDIRS += OCC
 endif
 

Modified: cgm/trunk/init/Makefile.am
===================================================================
--- cgm/trunk/init/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
+++ cgm/trunk/init/Makefile.am	2008-11-03 16:25:01 UTC (rev 2199)
@@ -7,10 +7,12 @@
 INCLUDES = -I$(top_srcdir)/geom \
            -I$(top_srcdir)/util \
            -I$(top_srcdir)/geom/ACIS \
+           -I$(top_srcdir)/geom/OCC \
            -I$(top_srcdir)/geom/virtual \
            -I$(top_srcdir)/geom/facet \
            -I$(top_srcdir)/geom/cholla \
-           -I$(srcdir)
+           -I$(srcdir) \
+           $(OCC_INC_FLAG)
 
 noinst_LTLIBRARIES = libcgma_init.la
 libcgma_init_la_includedir = $(includedir)

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
+++ cgm/trunk/test/Makefile.am	2008-11-03 16:25:01 UTC (rev 2199)
@@ -18,7 +18,7 @@
   TESTS += webcut hollow_acis
   LINK_FLAGS += -R$(ACIS_LIB_DIR)
 endif
-if WITH_OCC
+if build_OCC
   TESTS += modify makept r_w test_occ
   LINK_FLAGS += -R$(OCC_LIB_DIR)
 endif