Commit bdec1866 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG: Updated isismake.objs so that CameraFactory, ProjectionFactory,... 

PROG: Updated isismake.objs so that CameraFactory, ProjectionFactory, NumericalApproximation, ProcessGroundPolygons do not core dump when unit tests are run without test coverage. This needs to be addressed in ticket 4473. References #2402.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7176 41f8697f-d340-4b68-9986-7bafba869bb8
parent df18c15c

isis/make/isismake.objs

+20 −0
Original line number Diff line number Diff line
@@ -304,6 +304,25 @@ test: unitTest 
#   to extract the same archive twice, regardless of permissions or symlink

unitTest: $(OBJS) unitTest.o

	if [ "$(HOST_ARCH)" == "Linux" ]; then                                        \

	  if [ "$(CODE_COVERAGE_BIN_DIR)" == "" ]; then                                \

	    $(CP) $(ISISROOT)/lib/libisis$(ISISLIBVERSION).a                        \

	    libisis$(ISISLIBVERSION).a;                                             \

	    if [ -f "$(ISISROOT)/lib/libisis$(ISISLIBVERSION).a.csmes" ]; then      \

	      $(CP) $(ISISROOT)/lib/libisis$(ISISLIBVERSION).a.csmes                \

	      libisis$(ISISLIBVERSION).a.csmes;                                     \

	    fi;                                                                     \

	    $(AR) $(ISISARFLAGS) -crs libisis$(ISISLIBVERSION).a $(OBJS);           \

	    $(RANLIB) libisis$(ISISLIBVERSION).a;                                   \

	    $(LDSHARED) $(ISISSHAREDFLAGS) $(ISISSHAREDON)                          \

	    -o libisis$(ISISLIBVERSION).$(SHAREDLIBEXT) libisis$(ISISLIBVERSION).a  \

	    $(ISISSHAREDOFF);                                                       \

	    $(RM) libisis$(ISISLIBVERSION).a libisis$(ISISLIBVERSION).a.csmes;      \

	    dollar='$$';                                                            \

	    $(CXX) $(ALLLIBDIRS)                                                    \

	      -Xlinker "-rpath"                                                     \

	      -Xlinker "$${dollar}ORIGIN" $(ISISLDFLAGS)                            \

	      -o $@ unitTest.o $(ALLLIBS);                                          \

	  else                                                                      \

	    $(AR) $(ISISARFLAGS) -crs $(LIBRARY).a *.o;                               \

	    $(LDSHARED) $(ISISSHAREDFLAGS) $(ISISSHAREDON)                            \

	        -o $(LIBRARY).$(SHAREDLIBEXT) $(LIBRARY).a                            \
@@ -314,6 +333,7 @@ unitTest: $(OBJS) unitTest.o 
	        -Xlinker "-rpath"                                                     \

	        -Xlinker "$${dollar}ORIGIN" $(ISISLDFLAGS)                            \

	        -o $@ unitTest.o -l:$(LIBRARY).$(SHAREDLIBEXT) $(ALLLIBS);            \

	  fi;                                                                       \

	elif [ "$(HOST_ARCH)" == "Darwin" ]; then                                    \

	  $(MKDIR) .objs;                                                            \

	  cd .objs;                                                                  \