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

Integrated Kris's and Kelvin's changes to scripts, config, and 3rdParty files... 

Integrated Kris's and Kelvin's changes to scripts, config, and 3rdParty files in v006LibrariesV2 for properly building on OSX 10.11.

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

isis/3rdParty/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ all: install 


install: libs plugins



libs: license

#libs: license

libs:

	@for library in $(THIRDPARTYLIBS); do                                \

	  $(INSTALL3P) $(INSTALL3POPTS) $$library $(ISISROOT)/3rdParty/lib/; \

	  echo $(CURTIMESTAMP) "  Installing [$$library]";                   \
@@ -34,7 +35,7 @@ libs: license 
	    --liblog=DarwinLibs.lis --update                                 \

	    --relocdir=$(ISISROOT)/3rdParty/lib:$(ISISROOT)/3rdParty         \

	    --errlog=DarwinErrors.lis                                        \

	    `find $(ISISROOT)/3rdParty/lib -name '*.dylib' -type f`          \

	    `find $(ISISROOT)/3rdParty/lib -name '*.dylib*' -type f`          \

	    > /dev/null;                                                     \

	  $(ISISROOT)/scripts/SetRunTimePath --libs                          \

	     --libmap=$(ISISROOT)/scripts/qt_paths.lis                       \
@@ -78,7 +79,7 @@ plugins: 




clean:

	rm -f lib/lib*.so* lib/lib*.dylib lib/lib*.a

	rm -f lib/lib*.so* lib/lib*.dylib* lib/lib*.a

	cd lib && rm -rf *.framework

	$(RM) -rf license

	@for plugs in plugins/*; do \

isis/config/config.mak

+7 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
SHELL=bash

.SILENT:



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

QMAKE ?= $(shell which qmake 2 >& /dev/null)



ifeq ($(QMAKE),)
@@ -12,10 +13,14 @@ ifeq ($(QMAKE),) 
endif



ifeq ($(QMAKE),)

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

  QMAKE := $(wildcard /opt/usgs/$(ISISLOCALVERSION)/ports/bin/qmake)

endif



ifeq ($(QMAKE),)

  QMAKE := $(wildcard /opt/usgs/$(ISISLOCALVERSION)/ports/libexec/qt5/bin/qmake)

#  QMAKEPARMS := -nocache

endif



ifeq ($(QMAKE),)

  QMAKE := $(wildcard /opt/usgs/$(ISISLOCALVERSION)/ports/bin/qmake-mac)

endif
@@ -32,7 +37,7 @@ config: Makefile 


Makefile: FORCE config.pro

	if [ -f "$(QMAKE)" ]; then       \

	  $(QMAKE) -o Makefile config.pro 2>&1 | grep -v MESSAGE; \

	  $(QMAKE) $(QMAKEPARMS) -o Makefile config.pro 2>&1 | grep -v MESSAGE; \

	  $(MAKE) isis_conf;               \

	fi;

isis/config/config.pro

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#########################################################################

TEMPLATE = app

CONFIG -= app_bundle

QMAKE_MACOSX_DEPLOYMENT_TARGET = $$QMAKE_MAC_SDK.macosx.version



TARGET = $(ISISROOT)/make/isis.conf

QMAKE_CLEAN += $${TARGET}
@@ -23,7 +24,7 @@ linux-g++-64 { 


macx {

  MAC_ARCH = -arch $$ISIS_ARCH

  ISIS_MACOSX_TARGET = $$QMAKE_MACOSX_DEPLOYMENT_TARGET

  ISIS_MACOSX_TARGET = $$QMAKE_MAC_SDK.macosx.version

  contains (ISIS_MACOSX_TARGET, 10.4) {

    ISIS_MACOSX_TARGET = 10.5

  }

isis/scripts/darwin_IsisDlm_paths.lis

+7 −6
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ 
/opt/local/libexec/qt4-mac      @loader_path/../../3rdParty

/opt/local                      @loader_path/../../3rdParty

#  New MacPorts structure

/opt/usgs/(.*?)/libexec/qt5/lib @loader_path/../../3rdParty/lib

/opt/usgs/(.*?)lib              @loader_path/../../3rdParty/lib

/opt/usgs/(.*?)/Frameworks      @loader_path/../../3rdParty/lib

isis/scripts/darwin_lib_paths.lis

+6 −5
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ 
/opt/local/libexec/qt4-mac/lib  @loader_path

/opt/local/lib                  @loader_path

#  Add paths for new MacPorts structure

/opt/usgs/(.*?)/qt5/lib  @loader_path

/opt/usgs/(.*?)/lib                   @loader_path

/opt/usgs/(.*?)/Frameworks            @loader_path