Merge pull request #436 from SgStapleton/cmake (67759e6c) · Commits · aflab / astrogeology / ISIS3

environment.yml

+32 −33

Original line number	Diff line number	Diff line
		channels:
		- krodriguez
		- usgs-astrogeology
		- conda-forge
		- probcomp
		@@ -8,25 +7,9 @@ channels:

		dependencies:
		- armadillo==8.200.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
		- wheel==0.30.0
		- xerces-c==3.1.4=0
		- zlib==1.2.11=0
		- blas==1.1=openblas
		- bullet==2.86.1=0
		- bz2file==0.98
		- bzip2==1.0.6=1
		- cmake==3.9.1=0
		- cspice==66-0
		@@ -34,40 +17,56 @@ dependencies:
		- doxygen==1.8.14=0
		- eigen==3.3.3=0
		- embree==2.14.0=0
		- geos==3.5.1
		- geotiff==1.4.2=1
		- gmm==5.0
		- gmp==6.1.2=0
		- gsl==2.2.1=blas_openblas_3
		- hdf5==1.8.18=2
		- icu==58.2=0
		- jama==125
		- jpeg==9b=2
		- kakadu==1
		- krb5==1.14.2=0
		- libpng>=1.6.34
		- libprotobuf==3.5.2
		- libtiff==4.0.9=0
		- libxml2==2.9.7=0
		- make
		- mesalib==17.2.0=0
		- mysql==5.7.20
		- mysql-connector-c==6.1.6=0
		- nanoflann==1.2.2
		- ninja==1.7.2=0
		- nn==1.86.0=2
		# - numpy==1.13.3=py36_blas_openblas_200
		- openblas==0.2.19=2
		- opencv
		- nanoflann==1.2.2
		- gmm==5.0
		- jama==125
		- openssl==1.0.2n=0
		- patchelf==0.9
		- pcl==1.8.1
		- pip==9.0.1
		- protobuf==3.5.2
		# - pyqt==5.6.0
		- python==3.6
		- qhull==7.2.0=0
		- qt=5.9.6
		- qwt=6.1.3
		- setuptools=38.5.1
		- sip==4.18
		- sqlite==3.13.0=1
		- suitesparse==4.5.4=blas_openblas_200
		- superlu==5.2.1=blas_openblas_201
		- xorg-kbproto==1.0.7=1
		- xorg-libx11==1.6.4=6
		- bz2file==0.98
		- bullet==2.86.1=0
		- qhull==7.2.0=0
		- qt=5.9.6
		- qwt
		- tnt==126=0
		- xalan-c==1.11
		- wheel==0.30.0
		- x264==20131218
		- make
		- kakadu==1
		- xalan-c==1.11
		- xerces-c==3.1.4=0
		- xorg-kbproto==1.0.7=1
		- xorg-libice
		- xorg-libsm
		- xorg-libx11==1.6.4=6
		- xorg-libxi
		- zlib==1.2.11=0

		prefix: /scratch/anaconda3/envs/isis

isis/cmake/BuildDocs.cmake

+13 −5

Original line number	Diff line number	Diff line
		@@ -96,18 +96,26 @@ function(build_documents_folder)
		message("Building documents folder...")
		message(" Building table of contents XML...")

		# Create RealeaseNotes.xml, ApiChanges.xml and ParameterChanges.xml if need-be
		if(EXISTS "${docBuildFolder}/documents/ReleaseNotes/ReleaseNotesList.xml")
		execute_process(COMMAND ${XALAN} ${XALAN_PARAM_OPTION} dirParam \"ReleaseNotes\" ${XALAN_INFILE_OPTION} ${docBuildFolder}/documents/ReleaseNotes/ReleaseNotesList.xml ${XALAN_XSL_OPTION} ${docBuildFolder}/build/ReleaseNotes.xsl OUTPUT_FILE ${docBuildFolder}/documents/ReleaseNotes/ReleaseNotes.xml)
		execute_process(COMMAND ${XALAN} ${XALAN_PARAM_OPTION} dirParam \"ParameterChanges\" ${XALAN_INFILE_OPTION} ${docBuildFolder}/documents/ReleaseNotes/ReleaseNotesList.xml ${XALAN_XSL_OPTION} ${docBuildFolder}/build/ParameterChanges.xsl OUTPUT_FILE ${docBuildFolder}/documents/ParameterChanges/ParameterChanges.xml)
		execute_process(COMMAND ${XALAN} ${XALAN_PARAM_OPTION} dirParam \"ApiChanges\" ${XALAN_INFILE_OPTION} ${docBuildFolder}/documents/ReleaseNotes/ReleaseNotesList.xml ${XALAN_XSL_OPTION} ${docBuildFolder}/build/ApiChanges.xsl OUTPUT_FILE ${docBuildFolder}/documents/ApiChanges/ApiChanges.xml)
		else()
		# Confirm that empty directories are not going to be traversed in loops coming up
		message(" ReleaseNotesList.xml does not exist. Removing ReleaseNotes/ ParameterChanges/ and ApiChanges/ directories...")
		execute_process(COMMAND rm -rf ${docBuildFolder}/documents/ReleaseNotes ${docBuildFolder}/documents/ParameterChanges ${docBuildFolder}/documents/ApiChanges)
		endif()

		# Get list of folders of interest
		get_subdirectory_list(${docBuildFolder}/documents docFolders)
		set(blacklistFolders ${docBuildFolder}/documents/ReleaseNotes # Folders we don't want
		${docBuildFolder}/documents/ParameterChanges
		${docBuildFolder}/documents/ApiChanges)
		list(REMOVE_ITEM docFolders ${blacklistFolders})

		# Build doctoc.xml, the documents table of contents file.
		set(doctocPath ${docBuildFolder}/build/doctoc.xml)
		file(REMOVE ${doctocPath})
		cat(${docBuildFolder}/build/doctoc_header.xml ${doctocPath})
		foreach(f ${docFolders})

		# Each folder in documents gets a section added to doctoc
		get_filename_component(docName ${f} NAME_WE)