Commit 3db0b6bb authored by Stuart Sides's avatar Stuart Sides
Browse files

PROG Fixed the previously added and reverted Fedora 21 support Ref #2202 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6207 41f8697f-d340-4b68-9986-7bafba869bb8
parent 0cb8b15b

isis/3rdParty/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -82,3 +82,10 @@ clean: 
	  fi \

	done;

	

#----------------------------------------------------------------------------

# Use to see values of variables

#  Example: make print-HOST_OS

#  Will print the make variable HOST_OS

#----------------------------------------------------------------------------

print-%  :

	@echo '$* = $($*)'

isis/Makefile

+31 −12
Original line number Diff line number Diff line 
include $(ISISROOT)/make/isismake.utils

include $(ISISROOT)/make/isismake.os



#---------------------------------------------------------------------------

#  Set up ISIS versioning

#---------------------------------------------------------------------------

ISISVERSIONFULL      := $(shell head -n 1 $(ISISROOT)/version | sed 's/\#.*//' | sed 's/ *$$//')

ISISMAJOR            := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f1)

ISISMINOR            := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f2)

ISISMINORMINOR       := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f3)

ISISMINORMINORMINOR  := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f4)

ISISVERSION          := $(ISISMAJOR).$(ISISMINOR).$(ISISMINORMINOR).$(ISISMINORMINORMINOR)

ISISLIBVERSION       := $(shell echo $(ISISMAJOR).$(ISISMINOR).$(ISISMINORMINOR) | sed 's/[a-z].*$$//')

ISISLOCALVERSION     := $(shell head -n 3 $(ISISROOT)/version | tail -n 1 | sed 's/\#.*//' | sed 's/ *$$//')

ISISRELEASE          := REL_0_0

#ISISVERSIONFULL      := $(shell head -n 1 $(ISISROOT)/version | sed 's/\#.*//' | sed 's/ *$$//')

#ISISMAJOR            := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f1)

#ISISMINOR            := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f2)

#ISISMINORMINOR       := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f3)

#ISISMINORMINORMINOR  := $(shell echo $(ISISVERSIONFULL) | cut -d"." -f4)

#ISISVERSION          := $(ISISMAJOR).$(ISISMINOR).$(ISISMINORMINOR).$(ISISMINORMINORMINOR)

#ISISLIBVERSION       := $(shell echo $(ISISMAJOR).$(ISISMINOR).$(ISISMINORMINOR) | sed 's/[a-z].*$$//')

#ISISLOCALVERSION     := $(shell head -n 3 $(ISISROOT)/version | tail -n 1 | sed 's/\#.*//' | sed 's/ *$$//')

#ISISRELEASE          := REL_0_0



.NOTPARALLEL:
@@ -222,7 +222,7 @@ coverage: 
#

# This target cleans the entire Isis system enough for a recompile.  It cleans ".o" files and

# binary executables from the source tree.  It also, clears the running

# areas under $ISISROOT (inc, doc, bini, bin/xml, and lib)

# areas under $ISISROOT (inc, doc, bin, bin/xml, and lib)

#

# Target = quickclean 

# Dependencies = none
@@ -319,7 +319,7 @@ catTest: 
# not have to download and install RPMs.

#----------------------------------------------------------------------------

HOST_ARCH ?= $(shell uname -s)

HOST_MACH  = $(shell uname -m)

HOST_MACH ?= $(shell uname -m)



thirdParty: config

	echo $(CURTIMESTAMP) "Installing 3rdParty libraries"
@@ -328,4 +328,23 @@ thirdParty: config 
	echo $(CURTIMESTAMP) "Finished installing 3rdParty libraries"

	echo $(CURTIMESTAMP) " "





#----------------------------------------------------------------------------

# Use to see values of variables

#  Example: make print-HOST_OS

#  Will print the make variable HOST_OS

#----------------------------------------------------------------------------

#print-%  :

#	@echo '$* = $($*)'



#----------------------------------------------------------------------------

# Standard make FORCE target. Do not remove unless you know what you are doing

#----------------------------------------------------------------------------



FORCE:



#----------------------------------------------------------------------------

# Include the make file debugging targets

#----------------------------------------------------------------------------

include $(ISISROOT)/make/isismake.print

isis/make/config.darwin

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
#  Determine MacOSX Architecture.  Ensure the host architecture is set

#  and then determine machine type

#---------------------------------------------------------------------------

include $(ISISROOT)/make/isis.conf

#include $(ISISROOT)/make/isis.conf



HOST_ARCH ?= $(shell uname -s)

HOST_MACH := $(shell uname -m)

NODE_NAME := $(shell uname -n)



ifeq ($(HOST_ARCH),Darwin)

  include $(ISISROOT)/make/config.darwin-$(ISIS_MACOSX_TARGET)

  include $(ISISROOT)/make/config.darwin-$(HOST_OS)

endif

isis/make/config.darwin-10.10→isis/make/config.darwin-MacOSX10_10

+13 −3
Original line number Diff line number Diff line
@@ -3,7 +3,17 @@ 
# Compiler options

#---------------------------------------------------------------------------

#  Build architecture now automatically determined at build time via isis.conf

include $(ISISROOT)/make/isis.conf

#include $(ISISROOT)/make/isis.conf



MAC_ARCH=-arch x86_64

MAC_XARCH=-Xarch_x86_64

MAC_OS_MIN=-mmacosx-version-min=10.10

QTDEFINES=-DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED

ISIS_ARCH=x86_64

ISIS_MACOSX_TARGET=10.10

ISIS_CXXFLAGS=-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED

ISIS_LFLAGS=-headerpad_max_install_names -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10





MAC_ARCH_FLAGS = $(MAC_ARCH) $(MAC_XARCH) $(MAC_OS_MIN)
@@ -63,13 +73,13 @@ ISISARFLAGS = 
#  Set ISIS Dev Kit (IDK) paths.  This setting of ISISLOCALVERSION here will 

#  override this macro set in isismake.os (KJB 2013-12-12)

#---------------------------------------------------------------------------

ISISLOCALVERSION ?= v003

ISISLOCALVERSION := v003

IDK_ROOT         ?= /opt/usgs/$(ISISLOCALVERSION)

ISIS3OPT         ?= $(IDK_ROOT)/ports

ISIS3LOCAL       ?= $(IDK_ROOT)/3rdparty

ISIS3PROP        ?= $(IDK_ROOT)/proprietary



#  Set up paths to needed apps

#  Set up paths to tools needed for doxygen

DOXYGEN     = $(ISIS3OPT)/bin/doxygen

DOT_PATH    = $(ISIS3OPT)/bin 

LATEX       = $(ISIS3OPT)/bin/latex

isis/make/config.darwin-10.6→isis/make/config.darwin-MacOSX10_6

+11 −2
Original line number Diff line number Diff line
@@ -3,7 +3,16 @@ 
# Compiler options

#---------------------------------------------------------------------------

#  Build architecture now automatically determined at build time via isis.conf

include $(ISISROOT)/make/isis.conf

#include $(ISISROOT)/make/isis.conf



MAC_ARCH=-arch x86_64

MAC_XARCH=-Xarch_x86_64

MAC_OS_MIN=-mmacosx-version-min=10.6

QTDEFINES=-DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED

ISIS_ARCH=x86_64

ISIS_MACOSX_TARGET=10.6

ISIS_CXXFLAGS=-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.6 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED

ISIS_LFLAGS=-headerpad_max_install_names -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.6



MAC_ARCH_FLAGS = $(MAC_ARCH) $(MAC_XARCH) $(MAC_OS_MIN)
@@ -67,7 +76,7 @@ ISIS3OPT ?= $(IDK_ROOT)/ports 
ISIS3LOCAL     ?= $(IDK_ROOT)/3rdparty

ISIS3PROP      ?= $(IDK_ROOT)/proprietary



#  Set up paths to needed apps

#  Set up paths to needed for doxygen

DOXYGEN     = $(ISIS3OPT)/bin/doxygen

DOT_PATH    = $(ISIS3OPT)/bin 

LATEX       = $(ISIS3OPT)/bin/latex