Merge branch 'cmake' of https://github.com/USGS-Astrogeology/ISIS3 into cmake (9cf62a06) · Commits · aflab / astrogeology / ISIS3

.gitignore

+2 −1

Original line number	Diff line number	Diff line
		@@ -27,10 +27,11 @@ object_script.*.Debug
		*_plugin_import.cpp
		*.moc
		ui_*.h
		*.html
		*html

		# ignore all files created by squish coco
		*csmes
		*csexe

		print.prt

environment.yml

+9 −10

Original line number	Diff line number	Diff line
		name: isis
		channels:
		- krodriguez
		- usgs-astrogeology
		- conda-forge
		- probcomp
		- anaconda
		- jlaura
		- defaults

		dependencies:
		- libgfortran==3.0
		- pcl==1.8.1
		- geos==3.5.1
		- protobuf==3.5.2
		- libprotobuf==3.5.2
		- qwt=6.1.3
		- pyqt==5.6.0
		- sip==4.18
		- mysql==5.7.20
		- ninja==1.7.2=0
		- xorg-libsm
		- xorg-libxi
		- xorg-libice
		- patchelf==0.9
		- pip==9.0.1
		- setuptools=38.5.1
		@@ -21,8 +26,6 @@ dependencies:
		- xerces-c==3.1.4=0
		- zlib==1.2.11=0
		- blas==1.1=openblas
		- boost==1.65.1
		- boost-cpp==1.65.1
		- bzip2==1.0.6=1
		- cmake==3.9.1=0
		- cspice==66-0
		@@ -30,7 +33,6 @@ dependencies:
		- doxygen==1.8.14=0
		- eigen==3.3.3=0
		- embree==2.14.0=0
		- geos==3.5.1=1
		- geotiff==1.4.2=1
		- gmp==6.1.2=0
		- gsl==2.2.1=blas_openblas_3
		@@ -47,7 +49,7 @@ dependencies:
		- numpy==1.13.3=py36_blas_openblas_200
		- openblas==0.2.19=2
		- opencv==3.3.0
		- nanoflann==1.22
		- nanoflann==1.2.2
		- gmm==5.0
		- jama==125
		- openssl==1.0.2n=0
		@@ -58,10 +60,7 @@ dependencies:
		- xorg-kbproto==1.0.7=1
		- xorg-libx11==1.6.4=6
		- bz2file==0.98
		- protobuf==3.5.1
		- libprotobuf==3.2.0=0
		- bullet==2.86.1=0
		- pcl==1.8.1
		- qhull==7.2.0=0
		- qt=5.6.2
		- qwt

isis/3rdParty/Makefile

0 → 100644

+121 −0

Original line number	Diff line number	Diff line
		include $(ISISROOT)/make/isismake.os

		.PHONY: libs license plugins

		all: install

		install: libs license plugins

		#libs: license
		libs:
		@for library in $(THIRDPARTYLIBS); do \
		$(INSTALL3P) $(INSTALL3POPTS) $$library $(ISISROOT)/3rdParty/lib/; \
		echo $(CURTIMESTAMP) " Installing [$$library]"; \
		if [ "$(HOST_ARCH)" == "Linux" ]; then \
		for file in $$library; do \
		localFile=$(ISISROOT)/3rdParty/lib/`basename $$file`; \
		if [ ! -L "$$localFile" ]; then \
		existingRpath=`$(PATCHELF) --print-rpath "$$localFile" 2>&- \| \
		cut -d '/' -f2-4`; \
		dollar='$$'; \
		newRpath=`echo "$${dollar}ORIGIN"`; \
		if [ "$$existingRpath" == "usgs/pkgs/local" ]; then \
		echo $(CURTIMESTAMP) " Patching [" `basename $$file` "]"; \
		$(PATCHELF) --set-rpath "$$newRpath" $$localFile; \
		fi; \
		fi; \
		done; \
		fi; \
		done; \
		for library in $(PATCHLIBS); do \
		$(INSTALL3P) $(INSTALL3POPTS) $$library $(ISISROOT)/3rdParty/lib/; \
		echo $(CURTIMESTAMP) " Installing [$$library]"; \
		if [ "$(HOST_ARCH)" == "Linux" ]; then \
		for file in $$library; do \
		localFile=$(ISISROOT)/3rdParty/lib/`basename $$file`; \
		if [ ! -L "$$localFile" ]; then \
		dollar='$$'; \
		newRpath=`echo "$${dollar}ORIGIN"`; \
		echo $(CURTIMESTAMP) " Patching [" `basename $$file` "]"; \
		$(PATCHELF) --set-rpath "$$newRpath" $$localFile; \
		fi; \
		done; \
		fi; \
		done; \
		if [ "$(HOST_ARCH)" == "Darwin" ]; then \
		chmod u+w $(ISISROOT)/3rdParty/lib/libcrypto.*.dylib; \
		chmod u+w $(ISISROOT)/3rdParty/lib/libssl.*.dylib; \
		chmod u+w $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5/Python;\
		$(ISISROOT)/scripts/SetRunTimePath --libs \
		--libmap=$(ISISROOT)/scripts/darwin_lib_paths.lis \
		--liblog=DarwinLibs.lis --update \
		--relocdir=$(ISISROOT)/3rdParty/lib:$(ISISROOT)/3rdParty \
		--errlog=DarwinErrors.lis \
		`find $(ISISROOT)/3rdParty/lib -name '.dylib' -type f` \
		> /dev/null; \
		$(ISISROOT)/scripts/SetRunTimePath --libs \
		--libmap=$(ISISROOT)/scripts/qt_paths.lis \
		--liblog=DarwinLibs.lis \
		--relocdir=$(ISISROOT)/3rdParty/lib:$ISISROOT/3rdParty \
		--update \
		`find $(ISISROOT)/3rdParty/lib -name '[Qq]*' -print \
		-mindepth 3 -maxdepth 4 -type f` > /dev/null; \
		$(ISISROOT)/scripts/SetRunTimePath --bins \
		--libmap=$(ISISROOT)/scripts/darwin_bin_paths.lis \
		--liblog=DarwinLibs.lis \
		--relocdir=$(ISISROOT)/3rdParty/lib:$ISISROOT/3rdParty \
		--update \
		`find $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5 \
		-name 'Python' -print -type f` > /dev/null; \
		chmod u-w $(ISISROOT)/3rdParty/lib/libcrypto.*.dylib; \
		chmod u-w $(ISISROOT)/3rdParty/lib/libssl.*.dylib; \
		chmod u-w $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5/Python;\
		if [ -f "DarwinErrors.lis" ]; then \
		cat DarwinErrors.lis; \
		fi; \
		$(RM) DarwinErrors.lis DarwinLibs.lis; \
		fi

		license:
		$(RSYNC) -a $(THIRDPARTYLICPATH) \
		$(ISISROOT)/3rdParty/license/

		plugins:
		@for plugs in $(THIRDPARTYPLUGINS); do \
		echo $(CURTIMESTAMP) " Installing [$$plugs...]"; \
		$(INSTALL3P) $(INSTALL3POPTS) $$plugs $(ISISROOT)/3rdParty/plugins/; \
		done; \
		if [ "$(HOST_ARCH)" == "Darwin" ]; then \
		$(ISISROOT)/scripts/SetRunTimePath --bundles \
		--libmap=$(ISISROOT)/scripts/qt_plugins_paths.lis \
		--liblog=DarwinLibs.lis --update \
		--relocdir=$(ISISROOT)/3rdParty/lib:$(ISISROOT)/3rdParty \
		--errlog=DarwinErrors.lis \
		`find $(ISISROOT)/3rdParty/plugins -name '*.bundle' -type f` \
		`find $(ISISROOT)/3rdParty/plugins -name '*.dylib' -type f` \
		> /dev/null; \
		if [ -f "DarwinErrors.lis" ]; then \
		cat DarwinErrors.lis; \
		fi; \
		$(RM) DarwinErrors.lis DarwinLibs.lis; \
		fi


		clean:
		rm -f lib/lib.so lib/lib.dylib lib/lib*.a
		cd lib && rm -rf *.framework
		$(RM) -rf license
		@for plugs in plugins/*; do \
		if [ -d $$plugs -a $$plugs != "plugins/CVS" ]; \
		then \
		$(RM) -rf $$plugs; \
		fi \
		done;

		#----------------------------------------------------------------------------
		# Use to see values of variables
		# Example: make print-HOST_OS
		# Will print the make variable HOST_OS
		#----------------------------------------------------------------------------
		print-% :
		@echo '$* = $($*)'

isis/3rdParty/lib/README

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		This directory contains O/S and hardware specific shared libraries needed
		to execute ISIS applications

isis/3rdParty/plugins/README

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		This directory contains Qt plugins that are exported for use in Isis
		applications.