Commit 5381b894 authored Jun 15, 2018 by Jesse Mapel

Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth

parents 20b10a47 a5db232f

isis/make/config.darwin-10.5

+2 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ QTDARWINFLAGS += -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
		QTDIR = $(ISIS3OPT)
		QTINCDIR = -I$(QTDIR)/libexec/qt4-mac/mkspecs/macx-g++
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtCharts
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtCore
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtAssistant
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtGui
		@@ -266,6 +267,7 @@ THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtXml.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtSql.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtGui.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtCore.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtWebKit.framework"

isis/make/config.darwin-MacOSX10_10

+2 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ ifeq (,$(findstring $(QTFRAMEWORKDIR)/QtCore.framework,$(wildcard $(QTFRAMEWORKD
		endif

		QTINCDIR = -I$(QTDIR)/share/qt4/mkspecs/macx-g++
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtAssistant.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtGui.framework/Headers
		@@ -319,6 +320,7 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtXml.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSql.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtGui.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCore.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework"

isis/make/config.darwin-MacOSX10_11

+4 −3

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ QTDIR = $(ISIS3EXEC)/qt5
		QTFRAMEWORKDIR = $(QTDIR)/lib

		QTINCDIR = -I$(QTDIR)/mkspecs/macx-clang
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtConcurrent.framework/Headers
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtDBus.framework/Headers

isis/make/config.darwin-MacOSX10_6

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ ifeq (,$(findstring $(QTFRAMEWORKDIR)/QtCore.framework,$(wildcard $(QTFRAMEWORKD
		endif

		QTINCDIR = -I$(QTDIR)/share/qt4/mkspecs/macx-g++
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtAssistant.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtGui.framework/Headers
		@@ -324,6 +325,7 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtXml.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSql.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtGui.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCore.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework"

isis/make/config.darwin-MacOSX10_8

+2 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ ifeq (,$(findstring $(QTFRAMEWORKDIR)/QtCore.framework,$(wildcard $(QTFRAMEWORKD
		endif

		QTINCDIR = -I$(QTDIR)/share/qt4/mkspecs/macx-g++
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtAssistant.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtGui.framework/Headers
		@@ -328,6 +329,7 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtXml.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSql.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtGui.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCore.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework"