[cgma-dev] r1814 - in cgm/trunk: geom itaps

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-05-15 14:56:01 -0500 (Thu, 15 May 2008)
New Revision: 1814

Modified:
   cgm/trunk/geom/BodySM.hpp
   cgm/trunk/itaps/Makefile.am
Log:
o Back out previous change: linking of cgma_init needs to remain separate
  from other CGM libraries because all others are overriden if using an
  existing libcubit.
  
o Fix missing library search path for libcubit

o Fix self-recursive variable for OpenCascade link

o Separate uninstalled include and link paths from installed paths so
  as to retain the ability to use an installed CGM while greatly reducing
  the noise when referencing an installed one.



Modified: cgm/trunk/geom/BodySM.hpp
===================================================================
--- cgm/trunk/geom/BodySM.hpp	2008-05-15 19:54:11 UTC (rev 1813)
+++ cgm/trunk/geom/BodySM.hpp	2008-05-15 19:56:01 UTC (rev 1814)
@@ -74,7 +74,6 @@
 
       CubitBox bounding_box();
       
-      virtual CubitBoolean is_sheet_body() = 0; 
    protected: 
 
    private:

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-05-15 19:54:11 UTC (rev 1813)
+++ cgm/trunk/itaps/Makefile.am	2008-05-15 19:56:01 UTC (rev 1814)
@@ -14,8 +14,10 @@
 
 if build_ACIS
   TEST_ACISLIBS = $(top_builddir)/geom/ACIS/libcubit_ACIS.la
+  TEST_ACISPATH = -R$(ACIS_LIB_DIR)
 else
   TEST_ACISLIBS =
+  TEST_ACISPATH =
 endif
 
 if BUILD_CGM
@@ -66,8 +68,8 @@
 testgeom_SOURCES = testgeom.cc
 testgeom_LDADD = $(TEST_XLDFLAGS) libiGeom.la  ../init/libcgma_init.la $(TEST_XLIBS)
 testgeom_CPPFLAGS = $(CPPFLAGS) -DSRCDIR=$(srcdir)
+testgeom_LDFLAGS = $(TEST_ACISPATH)
 
-
 # Automake doesn't seem to have a directory defined for
 # platform-dependent data (or include) files. So put 
 # in $(libdir).  Define a $(cfgdir) to get around automake's