Merge pull request #359 from kberryUSGS/cmake (84b89f7d) · Commits · aflab / astrogeology / ISIS3

.gitignore

+0 −153

Original line number	Diff line number	Diff line
		@@ -45,162 +45,9 @@ print.prt
		*/build/
		*/install/

		# Created by https://www.gitignore.io/api/c++

		### C++ ###
		# Prerequisites
		*.d
		*.hpp
		*.sbf

		# Compiled Object files
		*.slo
		*.lo
		*.o
		*.obj

		# Precompiled Headers
		*.gch
		*.pch

		# Compiled Dynamic libraries
		*.so
		*.dylib
		*.dll

		# Fortran module files
		*.mod
		*.smod

		# Compiled Static libraries
		*.lai
		*.la
		*.a
		*.lib

		# Executables
		*.exe
		*.out
		*.app


		# Created by https://www.gitignore.io/api/osx

		### OSX ###
		*.DS_Store
		.AppleDouble
		.LSOverride

		# Icon must end with two \r
		Icon
		# Thumbnails
		._*
		# Files that might appear in the root of a volume
		.DocumentRevisions-V100
		.fseventsd
		.Spotlight-V100
		.TemporaryItems
		.Trashes
		.VolumeIcon.icns
		.com.apple.timemachine.donotpresent
		# Directories potentially created on remote AFP share
		.AppleDB
		.AppleDesktop
		Network Trash Folder
		Temporary Items
		.apdisk


		# Created by https://www.gitignore.io/api/python

		### Python ###
		# Byte-compiled / optimized / DLL files
		__pycache__/
		*.py[cod]
		*$py.class

		# C extensions
		*.so

		# Distribution / packaging
		.Python
		env/
		build/
		develop-eggs/
		dist/
		downloads/
		eggs/
		.eggs/
		lib/
		lib64/
		parts/
		sdist/
		var/
		*.egg-info/
		.installed.cfg
		*.egg

		# PyInstaller
		# Usually these files are written by a python script from a template
		# before PyInstaller builds the exe, so as to inject date/other infos into it.
		*.manifest
		*.spec

		# Installer logs
		pip-log.txt
		pip-delete-this-directory.txt

		# Unit test / coverage reports
		htmlcov/
		.tox/
		.coverage
		.coverage.*
		.cache
		nosetests.xml
		coverage.xml
		*,cover
		.hypothesis/

		# Translations
		*.mo
		*.pot

		# Django stuff:
		*.log
		local_settings.py

		# Flask stuff:
		instance/
		.webassets-cache

		# Scrapy stuff:
		.scrapy

		# Sphinx documentation
		docs/_build/

		# PyBuilder
		target/

		# Jupyter Notebook
		.ipynb_checkpoints

		# pyenv
		.python-version

		# celery beat schedule file
		celerybeat-schedule

		# dotenv
		.env

		# virtualenv
		.venv/
		venv/
		ENV/

		# Spyder project settings
		.spyderproject

		# Rope project settings
		.ropeproject

isis/make/config.linux-x86_32

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ endif
		#---------------------------------------------------------------------------
		QTINCDIR = -I$(ISIS3LOCAL)/include/qt/qt4.6.2
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/Qt
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtChrats
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtCore
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtAssistant
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.6.2/QtGui

isis/make/config.linux-x86_64

+4 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXml
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXmlPatterns
		QTLIBDIR = -L$(ISIS3LOCAL)/lib
		QTLIB = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebEngine -lQt5WebEngineWidgets -lQt5DBus

		UIC = $(ISIS3LOCAL)/bin/uic
		MOC = $(ISIS3LOCAL)/bin/moc
		RCC = $(ISIS3LOCAL)/bin/rcc

isis/make/config.linux-x86_64_Debian8

+3 −3

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXml
		QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.7.1/QtXmlPatterns
		QTLIBDIR = -L$(ISIS3LOCAL)/lib
		QTLIB = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebEngine -lQt5WebEngineWidgets -lQt5DBus

		UIC = $(ISIS3LOCAL)/bin/uic
		MOC = $(ISIS3LOCAL)/bin/moc
		RCC = $(ISIS3LOCAL)/bin/rcc
		@@ -359,6 +358,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include
		#---------------------------------------------------------------------------

		# Qt Libraries

		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.7.*[^g]"

isis/make/config.linux-x86_64_Fedora21

+5 −4

Original line number	Diff line number	Diff line
		@@ -368,6 +368,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include
		#---------------------------------------------------------------------------

		# Qt Libraries

		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"
		THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.7.*[^g]"