[cgma-dev] r5793 - in cgm/trunk/geom: . facet

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-13 22:43:08 -0500 (Sat, 13 Oct 2012)
New Revision: 5793

Removed:
   cgm/trunk/geom/CubitCompat.h
Modified:
   cgm/trunk/geom/facet/Makefile.am
Log:
CubitCompat.h is created as part of make, from CubitConfig.h.in
facet depends on facetbool


Deleted: cgm/trunk/geom/CubitCompat.h
===================================================================
--- cgm/trunk/geom/CubitCompat.h	2012-10-13 23:52:56 UTC (rev 5792)
+++ cgm/trunk/geom/CubitCompat.h	2012-10-14 03:43:08 UTC (rev 5793)
@@ -1,33 +0,0 @@
-/* geom/CubitCompat.h.  Generated from CubitCompat.h.in by configure.  */
-#ifndef CUBIT_COMPAT_H
-#define CUBIT_COMPAT_H
-
-/* Cubit 12 GeometryQueryTool interface */
-/* #undef CUBIT_12 */
-
-
-#ifdef __cplusplus
-
-#include "CubitString.hpp"
-
-struct ModelImportOptions
-{
-  //Acis options
-  unsigned short heal_step : 1;
-  unsigned short print_results : 1;
-  unsigned short import_bodies : 1;
-  unsigned short import_surfaces : 1;
-  unsigned short import_curves : 1;
-  unsigned short import_vertices : 1;
-  unsigned short free_surfaces : 1;
-  unsigned short merge_globally : 1;
-
-  //Granite option
-  unsigned short no_assembly_level_features : 1;
-
-  //Granite, Acis option
-  CubitString logfile_name;
-};
-#endif
-
-#endif /* CUBIT_COMPAT_H */

Modified: cgm/trunk/geom/facet/Makefile.am
===================================================================
--- cgm/trunk/geom/facet/Makefile.am	2012-10-13 23:52:56 UTC (rev 5792)
+++ cgm/trunk/geom/facet/Makefile.am	2012-10-14 03:43:08 UTC (rev 5793)
@@ -6,7 +6,7 @@
 # The name of the library to build
 lib_LTLIBRARIES = libcubit_facet.la
 
-AM_LDFLAGS += -lcubit_facetbool -L../facetbool
+libcubit_facet_la_LIBADD = ../facetbool/libcubit_facetbool.la
 
 # The directory where headers will be installed