1. SIGMA
  2. Components
  3. CGM

Commits

Vijay Mahadevan  committed 52745ab Merge

Merged in vijaysm/fix-install (pull request #55)

Fix installation

Approved-by: Iulian Grindeanu <iulian@mcs.anl.gov>
Approved-by: Rajeev Jain <rajeeja@gmail.com>

Comments (0)

Files changed (7)

File config/cgm.make.in Modified

View file
  • Ignore whitespace
  • Hide word diff
 CGM_INT_LTFLAGS = -R$(CGM_SECONDARY_DIR)/src/.libs
 CGM_INT_INCLUDE = -I$(CGM_PRIMARY_DIR) \
                   -I$(CGM_SECONDARY_DIR)/src \
+                  -I$(CGM_SECONDARY_DIR)/src/cgm \
                   -I$(CGM_PRIMARY_DIR)/src/util \
                   -I$(CGM_PRIMARY_DIR)/src/util/cgm \
                   -I$(CGM_SECONDARY_DIR)/src/util \
+                  -I$(CGM_SECONDARY_DIR)/src/util/cgm \
                   -I$(CGM_PRIMARY_DIR)/src/init \
                   -I$(CGM_PRIMARY_DIR)/src/init/cgm \
                   -I$(CGM_SECONDARY_DIR)/src/init \
+                  -I$(CGM_SECONDARY_DIR)/src/init/cgm \
                   -I$(CGM_PRIMARY_DIR)/src/geom \
                   -I$(CGM_PRIMARY_DIR)/src/geom/cgm \
                   -I$(CGM_SECONDARY_DIR)/src/geom \
+                  -I$(CGM_SECONDARY_DIR)/src/geom/cgm \
                   -I$(CGM_PRIMARY_DIR)/src/geom/OCC \
                   -I$(CGM_PRIMARY_DIR)/src/geom/OCC/cgm \
                   -I$(CGM_PRIMARY_DIR)/src/geom/virtual \
 CGM_CPPFLAGS = $(CGM_DEFINES) $(CGM_INCLUDES)
 
 # Link flags
-CGM_LIBS = -lcgm @CGM_EXT_LIBS@
+CGM_EXT_LIBS = @CGM_EXT_LIBS@
+CGM_LIBS = -lcgm $(CGM_EXT_LIBS)
 CGM_LDFLAGS = $(CGM_INT_LDFLAGS) @CGM_EXT_LDFLAGS@
 CGM_LTFLAGS = $(CGM_INT_LTFLAGS) @CGM_EXT_LTFLAGS@
 CGM_LIBS_LINK = $(CGM_LDFLAGS) $(CGM_LIBS)

File config/compiler.m4 Modified

View file
  • Ignore whitespace
  • Hide word diff
 EXTRA_PGI_ONLY_FCFLAGS="-Mfree"
 if (test "x$enable_debug" != "xno"); then # debug flags
 # GNU
-EXTRA_GNU_CXXFLAGS="-Wall -Wno-long-long -pipe -pedantic -Wpointer-arith -Wformat -Wformat-security -Wextra -Wno-variadic-macros -Wno-unknown-pragmas"
+EXTRA_GNU_CXXFLAGS="-Wall -Wno-long-long -pipe -pedantic -Wpointer-arith -Wformat -Wformat-security -Wextra -Wno-variadic-macros -Wno-unknown-pragmas -Wno-unused-parameter"
 EXTRA_GNU_FCFLAGS="-pipe -pedantic -ffree-line-length-0"
 # CLANG
 EXTRA_CLANG_CXXFLAGS="$EXTRA_GNU_CXXFLAGS"

File itaps/iGeom-Defs.inc.in Modified

View file
  • Ignore whitespace
  • Hide word diff
 
 # These should never be required for the iGeom interface
 IGEOM_INCLUDEDIR = @abs_srcdir@
-IGEOM_INCLUDES = -I$(IGEOM_INCLUDEDIR) -I@abs_builddir@ -I@abs_srcdir@/../src/geom -I@abs_srcdir@/../src/util -I@abs_builddir@/../src/geom -I@abs_builddir@/../src/util
+IGEOM_INCLUDES = -I$(IGEOM_INCLUDEDIR) -I@abs_builddir@ -I@abs_top_builddir@/src -I@abs_top_srcdir@/src/geom -I@abs_top_srcdir@/src/util -I@abs_top_builddir@/src/geom -I@abs_top_builddir@/src/util -I@abs_top_srcdir@/src/init -I@abs_top_builddir@/src/init 
 IGEOM_DEFINES = @HAVE_OCC_DEF@
 IGEOM_CPPFLAGS = $(IGEOM_DEFINES) $(IGEOM_INCLUDES)
 

File src/util/CMakeLists.txt Modified

View file
  • Ignore whitespace
  • Hide word diff
   cgm/ToolDataUser.hpp
   cgm/TtyProgressTool.hpp
   VariableArray.hpp
-  WeightedOctree.hpp
-  WeightedOctree.cpp
+  cgm/WeightedOctree.hpp
+  cgm/WeightedOctree.cpp
   # Generated files:
   "${CMAKE_CURRENT_BINARY_DIR}/cgm/CGMUtilConfigure.h")
 

File src/util/Makefile.am Modified

View file
  • Ignore whitespace
  • Hide word diff
   cgm/ToolData.hpp \
   cgm/ToolDataUser.hpp \
   cgm/TtyProgressTool.hpp \
+  cgm/WeightedOctree.hpp \
   cgm/CubitMessageHandler.hpp \
   cgm/CubitColor.hpp 
 # If template defs are included, then the template definitions
       cgm/RTreeNode.cpp \
       cgm/RStarTree.cpp \
       cgm/RStarTreeNode.cpp \
-      WeightedOctree.cpp
+      cgm/WeightedOctree.cpp
 else
   libcgm_util_la_SOURCES += \
       cgm/KDDTree.cpp \
       cgm/RTreeNode.cpp \
       cgm/RStarTree.cpp \
       cgm/RStarTreeNode.cpp \
-      WeightedOctree.cpp
+      cgm/WeightedOctree.cpp
 endif
 
 libcgm_util_la_LIBADD = ${CGM_EXT_LDFLAGS} -ldl

File src/util/ { → cgm } /WeightedOctree.cpp Renamed

  • Ignore whitespace
  • Hide word diff
File renamed but contents unchanged.

File src/util/ { → cgm } /WeightedOctree.hpp Renamed

  • Ignore whitespace
  • Hide word diff
File renamed but contents unchanged.