Commit graph

4263 commits

Author SHA1 Message Date
Michael Kuhn
61cc55985b pkgconf: New package (#5202)
pkgconf is a new pkg-config implementation with additional features and
no external dependencies.

For a detailed comparison, see: http://pkgconf.org/features.html
2017-08-24 17:54:14 -07:00
Audrey Thoma
6ff82ff5a3 ray: new package (#5200) 2017-08-24 16:31:21 -07:00
Sergey Kosukhin
a48b5a627c Make jpeg a virtual dependency. (#5190)
* Make jpeg a virtual dependency.

* Make 'libjpeg-turbo' the default implementation of 'jpeg'.
2017-08-24 10:30:35 +02:00
sknigh
49a9d63be7 Added options to libfabrics (#5191) 2017-08-23 15:47:28 -07:00
Audrey Thoma
359b21c888 pgdspider: new package (#5186)
* pgdspider: new package

* couple of fixes
2017-08-23 08:34:12 -05:00
Axel Huebl
0daa639788 Boost: develop (#5184)
Adds a development version of boost, based on their github master
repo.
Git clones the submodules forever, but installs! :)

Useful for testing since boost tends to break complex software
dependencies quite often. This helps testing it before releases.
2017-08-23 07:31:34 -05:00
Audrey Thoma
79df4db8e5 tcoffee: new package (#5185) 2017-08-22 13:48:23 -05:00
Axel Huebl
61c5b5faa7 Boost: 1.65.0 (#5182)
Adds the latest boost release.
Downloads seem to be pointing to bintray from the official homepage.
2017-08-22 13:46:54 -05:00
Sergey Kosukhin
f52bdeda2a Package 'libaec': no need to specify per version urls. (#5176) 2017-08-22 09:27:03 +02:00
Sergey Kosukhin
e55efdf8ed Updates for package 'cdo'. (#5179)
* Package 'cdo': removed obsolete version 1.6.9.

* Package 'cdo': updated urls.

* Package 'cdo': added version 1.9.0.

* Package 'cdo': no need to specify per version urls.

* Package 'cdo': switched from Package to AutotoolsPackage.

* Package 'cdo': added new variant 'openmp'.

* Package 'cdo': variants 'curl' and 'magics' by default.
2017-08-22 08:42:55 +02:00
Audrey Thoma
e0ebf44239 py-pyrad: new package (#5181) 2017-08-21 17:58:05 -05:00
Massimiliano Culpo
581f70ff6f Added custom messages for conflicts directive. fixes #4965 (#5083)
Users can now add an optional custom message to the conflicts directive.
Layout on screen has been changed to improve readability and the long
spec is shown in tree format. Two conflicts in `espresso` have been
modified to showcase the feature.
2017-08-21 09:20:07 -07:00
Axel Huebl
bd8ac0a738 Protobuf: 3.4 (#5177) 2017-08-21 07:29:47 -05:00
Todd Gamblin
10bb681b57 Unbuffer so that output from packages appears when redirecting
- Python I/O would not properly interleave (or appear) with output from
  subcommands.

- Add a flusing wrapper around sys.stdout and sys.stderr when
  redirecting, so that Python output is synchronous with that of
  subcommands.
2017-08-20 16:51:10 -07:00
Massimiliano Culpo
99fb394ac1 Group Travis CI jobs in stages (#5104)
- This should speed-up Travis CI tests and refers to #5049

- Travis uses build-stages to group tests together
    - The idea is to let fast tests fail first, then move to longer ones.
    - Added external perl to avoid download failure from CPAN and reduce build time
    - Disabling perl-dbi: continues to fail with (504 Gateway Time-out) on Travis

- We now cover all the build systems in tests:
    - Add back `openblas` to Travis as a separate package.
    - Switched `openblas` for `astyle` to build a simpler MakefilePackage.
    - Added 'tut' (WafPackage)
    - Added 'py-setuptools' (PythonPackage)
    - Added 'perl-dbi' (PerlPackage)
    - Added 'build_systems' directory to the ones for which we get a summary
    - Added 'openjpeg' (CMakePackage)
    - Added 'r-rcpp' (RPackage)
    - Added comments to build tests to show the covered build system
2017-08-19 14:52:27 -07:00
健美猫
be0e051870 Add version 1.7.1 for cub. (#5164) 2017-08-19 09:22:19 -05:00
Adam Moody
d80c70538f lbann: add depends_on hwloc (#5165) 2017-08-19 01:00:52 -05:00
Audrey Thoma
fa39afb598 cufflinks: new package (#5158) 2017-08-18 16:02:15 -05:00
Audrey Thoma
3d1c5f679f muscle: fix (#5160) 2017-08-18 16:01:30 -05:00
Kelly (KT) Thompson
c41c5bc9b8 For Tk, also provide a symlink for wishX.X. (#5161)
+ gitk (and possibly other tools) expect to find the Tk executable `wish`, so
  add a symlink with this name that points to the the versioned filename.
+ Example: `wish --> wish8.6`
2017-08-18 16:01:02 -05:00
healther
6d155833c5 build boost with graph library even when +mpi
Previously, when +graph and +mpi were enabled, the graph library
was replaced with the graph_parallel library. This alters the
logic for +graph+mpi to build both libraries.
2017-08-18 11:19:55 -07:00
Audrey Thoma
9ad8e79332 corset: new package (#5157) 2017-08-18 11:02:58 -05:00
Audrey Thoma
6abe8e7d91 parsimonator: new package (#5143)
* parsimonator: new package

* adding variant conflict
2017-08-18 09:36:35 -05:00
Audrey Thoma
5fb23b21e0 vegas2: new package (#5150)
* vegas2: new package

* small version things
2017-08-18 09:36:18 -05:00
George Hartzell
9af953a4cb Add info for nextflow@v0.25.6 (#5148) 2017-08-18 09:36:02 -05:00
Stephen McDowell
61238baf56 add man-db package and friends (#4844)
* add man-db package and friends

* fix groff, libpipeline, and man-db dependencies

* remove parallel groff altogether, build-only deps
2017-08-18 14:17:25 +02:00
zenln
6d2092e1eb Add a new package for gaussian (#5149)
* Gaussian: Gaussian install

* Adding Patch to spack installed files

* Adding extra environment variables for gaussian at run time

* Adding provides linda

* Adding linda as a provided package

* Shortning vars and fixing flake8 indentation and spacings
2017-08-17 18:33:44 -05:00
Audrey Thoma
cf796ed595 pagit: new package (#5140)
* pagit: new package

* removed unneeded env var
2017-08-17 15:32:30 -05:00
Audrey Thoma
94af7ccb77 new package libfabric (#5146)
* pbmpi: new package

* forgot about libfabric
2017-08-17 15:31:31 -05:00
Audrey Thoma
cb4ede001c pbmpi: new package (#5144) 2017-08-17 11:59:02 -05:00
Audrey Thoma
46d8cb8913 paml: new package (#5142) 2017-08-17 11:21:56 -05:00
Audrey Thoma
aa21590099 microbiomeutil: new package (#5134)
* microbiomeutil: new package

* got rid of unnecessary self

* oops
2017-08-17 09:19:00 -05:00
Adam J. Stewart
187f4420e2 Add new package for rhash, a cmake dependency (#5120)
* Add new package for rhash, a cmake dependency

* Add missing libuv dependency to cmake
2017-08-17 08:17:45 -05:00
Audrey Thoma
3bb7767839 py-faststructure: new package (#5131) 2017-08-17 07:49:57 -05:00
healther
d65d1269b9 add libiconv dependency to libxslt (#5138)
this is a fix to an installation that failed due to
configure for some reason not finding the libiconv
shipped with glibc, but still trying to link against it
see http://xmlsoft.org/FAQ.html
2017-08-17 07:18:02 -05:00
sknigh
dd790fdaae add missing dependencies to elfutils (#5135) 2017-08-16 20:46:12 -05:00
Audrey Thoma
4c32b0ad56 tppred: new package (#5091)
* tppred: new package

* fixed url_for_version

* fixed version spec on dependency

* removing unneeded dependency
2017-08-16 17:48:50 -07:00
Audrey Thoma
d423f85fed dialign-tx: new package (#5126)
* dialign-tx: new package

* utilizing build_directory variable

* forgot one
2017-08-16 17:36:29 -07:00
Audrey Thoma
3a55d45497 discovar: new package (#5129) 2017-08-16 17:35:04 -07:00
Audrey Thoma
6a2cfedc7a gapcloser: new package (#5130) 2017-08-16 17:34:43 -07:00
Audrey Thoma
dc3526c7f1 py-misopy: new package (#5119)
* py-misopy: new package

* waiting for link to be fixed

* got correct url and checksum

* specifying dependency version requirements
2017-08-16 14:53:43 -05:00
healther
b547e6a273 Add package rtags (#5111)
* Add package rtags

* fixed license

* transform to cmakepackage and add dependencies

* add dependencies and patch for rtags

* flake8 fix

* clean up dependencies
2017-08-16 13:14:54 -05:00
Cesare Cugnasco
ffaa0b7eee Adding Thrift versions 0.10.0 and 0.9.3 (#5117)
* Adding Thrift version 0.10.0 and 0.9.3

Hi, I've added the versions 0.10.0 and 0.9.3

* fixed  flake8 errors
2017-08-16 13:14:37 -05:00
Audrey Thoma
b12fd4e831 phylip: new package (#5121) 2017-08-16 13:13:38 -05:00
Audrey Thoma
7aa81afa68 preseq: new package (#5122) 2017-08-16 13:13:18 -05:00
Adam J. Stewart
11b3ce27b7 Add better generator support to CMakePackage (#4988)
* Add better generator support to CMakePackage

* List valid CMake generators on error
2017-08-16 12:25:37 -05:00
Adam J. Stewart
db657d938d Refactor IntelInstaller into IntelPackage base class (#4300)
* Refactor IntelInstaller into IntelPackage base class

* Move license attributes from __init__ to class-level

* Flake8 fixes: remove unused imports

* Fix logic that writes the silent.cfg file

* More specific version numbers for Intel MPI

* Rework logic that selects components to install

* Final changes necessary to get intel package working

* Various updates to intel-parallel-studio

* Add latest version of every Intel package

* Add environment variables for Intel packages

* Update env vars for intel package

* Finalize components for intel-parallel-studio package

Adds a +tbb variant to intel-parallel-studio.
The tbb package was renamed to intel-tbb.
Now both intel-tbb and intel-parallel-studio+tbb
provide tbb.

* Overhaul environment variables set by intel-parallel-studio

* Point dependent packages to the correct MPI wrappers

* Never default to intel-parallel-studio

* Gather env vars by sourcing setup scripts

* Use mpiicc instead of mpicc when using Intel compiler

* Undo change to ARCH

* Add changes from intel-mpi to intel-parallel-studio

* Add comment explaining mpicc vs mpiicc

* Prepend env vars containing 'PATH' or separators

* Flake8 fix

* Fix bugs in from_sourcing_file

* Indentation fix

* Prepend, not set if contains separator

* Fix license symlinking broken by changes to intel-parallel-studio

* Use comments instead of docstrings to document attributes

* Flake8 fixes

* Use a set instead of a list to prevent duplicate components

* Fix MKL and MPI library linking directories

* Remove +all variant from intel-parallel-studio

* It is not possible to build with MKL, GCC, and OpenMP at this time

* Found a workaround for locating GCC libraries

* Typos and variable names

* Fix initialization of empty LibraryList
2017-08-16 12:21:07 -05:00
Audrey Thoma
ad8c60239f mpiblast: new package (#5106) 2017-08-16 10:48:39 -05:00
Michael Kuhn
3a0e9f29e6 scorep: Fix build with GCC 7 (#5107) 2017-08-16 10:48:20 -05:00
Michael Kuhn
95915b81d0 otf2: Add 2.1 (#5108) 2017-08-16 10:48:02 -05:00
Adam J. Stewart
2f9b0f6dd6 Fix future import in hdf5-blosc (#5010) 2017-08-16 10:34:52 -05:00
healther
f6a452d3ad Add package rr (#5105)
* Add package rr

* Flake8 fixes

* fix flake8 no2

* add future dependency stub, add hw dependency and clean up

* add missing self
2017-08-16 10:29:02 -05:00
healther
dbdf38f617 Add package PyPytestXdist and dependencies (#5095)
* Add py-pytest-xdist

* fixed licenses

* attempt to fix flake8

* added missing build dependency
2017-08-16 10:26:39 -05:00
healther
480764de5c Add package py-pybind11 (#5096)
* py-pybind11 package was missing

* fixed license file

* attempt to fix flake8

* use python3 compatible python detection
2017-08-16 08:29:54 -05:00
Audrey Thoma
619e298b8d cdhit: new package (#5085) 2017-08-16 07:05:16 +02:00
Gregory Lee
450b19b6e0 fix reference to spec in apex package (#5076)
* fix reference to spec in apex package

* fixed md5 sums for ompt-openmp and apex packages
2017-08-15 17:17:02 -05:00
Brian Van Essen
7b51791625 Openblas clang fix (#5065)
* Added a package for the MDAnalysis toolkit.

* Openblas now builds with clang when using 0.2.20

* Fixed flake8 error

* Added a guard to fail for openblas+openmp when on OSX systems

* Changed the guard to look for Apple's build of clang and to improve
the error messages.

* Removed blank line.
2017-08-15 16:57:11 -05:00
healther
8df9f9e1f4 Fix ffmpeg (add missing yasm dependency) (#5087) 2017-08-15 16:54:39 -05:00
Michael Kuhn
256cd68b27 nco: Add patch to fix invalid conversion from char to char* (#5102)
This patch is needed to be able to build nco with GCC 7.
2017-08-15 16:53:22 -05:00
Michael Kuhn
8d4dec7430 ncview: Fix download URL (#5103) 2017-08-15 16:52:34 -05:00
healther
b52e549758 add version 0.2.10 to py-lazyarray (#5093) 2017-08-15 12:15:00 +02:00
Michael Kuhn
43a634ca80 gcc: Add 7.2.0 (#5098) 2017-08-15 12:14:07 +02:00
Mark C. Miller
5712fbfeb0 Use correct variant syntax to build zfp (#5099)
`h5z-zfp` now  builds zfp with correct bit stream word size; the syntax of the variant declaration did not work in previous versions of spack but does now
2017-08-15 12:10:09 +02:00
healther
b229b739de add older versions to package folly (#5088) 2017-08-15 12:01:33 +02:00
Patrick Gartung
ab56c742ca Create, install and relocate tarballs of installed packages
Adds the "buildcache" command to spack. The buildcache command is
used to create gpg signatures for archives of installed spack
packages; the signatures and archives are placed together in a
directory that can be added to a spack mirror. A user can retrieve
the archives from a mirror and verify their integrity using the
buildcache command. It is often the case that the user's Spack
instance is located in a different path compared to the Spack
instance used to generate the package archive and signature, so
this includes logic to relocate the RPATHs generated by Spack.
2017-08-14 14:32:27 -07:00
Brian Van Essen
3cce3e3ce4 Opencv update (#5079)
* Added a package for the MDAnalysis toolkit.

* Added version 3.3.0
2017-08-11 23:46:39 -05:00
snehring
64a32ea1f9 adding falcon (#5057)
* py-networkx: adding older version py-networkx

* py-pypeflow: new package

* falcon: adding new package
pacbio-daligner: adding new package
pacbio-damasker: adding new package
pacbio-dazz-db: adding new package
pacbio-dextractor: adding new package

* py-networkx: modifying version order to be in line with convention

* falcon: tweaking py-networkx dependency to satisfy setuptools
py-pypeflow: adding missing dependency

* pacbio-dextractor: changing hdf5 dependency

* pacbio-daligner: adding gmake build dep
pacbio-damasker: adding gmake build dep
pacbio-dazz-db: adding gmake build dep
pacbio-dextractor: adding gmake build dep
2017-08-11 17:26:20 -05:00
Audrey Thoma
9e7917f7d3 mpest: new package (#5064)
* mpest: new package

* adding architecture env var and making more version-flexible

* fixing environment

* fixed build directory

* getting rid of duplicated code
2017-08-11 17:25:26 -05:00
Gregory Lee
14076c52f1 packages need to reference self.spec instead of spec (#5075) 2017-08-11 17:24:40 -05:00
Audrey Thoma
056faad3a2 signalp: new package (#5054)
* signalp: new package

* fixed homepage

* fixed url and phases

* refixed phase

* improved readability

* making path in execuatble adaptable to new versions
2017-08-11 13:54:12 -05:00
Audrey Thoma
d16f823f9d sspace-standard: new pacakge (#5071)
* sspace-standard: new pacakge

* fixing install versioning

* fixing description
2017-08-11 13:51:27 -05:00
Audrey Thoma
a030c858dd sspace-longread: new package (#5072)
* sspace-longread: new package

* fixing description

* fixing order
2017-08-11 13:51:08 -05:00
Audrey Thoma
295cdc5674 gapfiller: new package (#5073) 2017-08-11 13:50:08 -05:00
Mark C. Miller
39cb589510 More variants for MFEM (#4533)
* fixes #967

* Version bump to 0.9.1

- Bugfixes for spack find
- 0.9.1 can read specs from current develop.

* Don't assume spack is in the path when building docs.

* adding mfem variants; do not assume build defaults

* adjusting format to clarify options

* fixing some build issues

* fixing mfem+sundials

* removing mesquite variant...turns out it is obsolete

* adding examples to mfem; fixing sundials darwin installs

* adding some additional variants and setting some configure flags by fiat

* switching most check_variants logic to conflicts() directives

* adding comment about cmake config

* fixing flake8 issues; thought I had already done that

* moving func def into install method

* switch yes_no to no_yes; fix miss-spelling of miniapps

* switching make target all to lib

* changing yes_no to function as requested; fix problem with same in sundials

* fix missing import sys directive

* adding master and develop versions to amrex
2017-08-11 08:39:48 -05:00
Brian Van Essen
71c5b19464 Elemental fix (#5067)
* Added a package for the MDAnalysis toolkit.

* Added additional packages that Elemental depends on.

* Changed LBANN to not ask for the scalapack variant in Elemental.

* Removed variant control on scalapack
2017-08-11 08:29:24 -05:00
EmreAtes
038efc623d New package: qbox (#4711)
* New package: qbox

* API changes

* Use install instead of shutil for comd

* Use any BLAS library

* Fix typo

* Python2 fix

* python2 + fix backslashes

* Modified to respond to ld_flags correctly

* Modified to use ld_flags

* Add ld_flags support
2017-08-10 20:12:08 -05:00
Akhil Reddy Patlolla
e3a4631037 Add AMG2013 package (#4836)
*  Updated Changes

*  Updated AMG with required MPI

*  Updated AMG with Version ' changes'

*  Fixed Issues with flag's and variant checks

*  Updated with MPI Alone and Changes - NO Serial Variant

*  Updated with MPI Alone and Changes - NO Serial Variant

* Fixed Flake 8 line length error

*  Updated Spack Issues
2017-08-10 20:09:59 -05:00
Akhil Reddy Patlolla
e4c22efc85 Variants Serial MPI openmp (#4897)
*  Variants Serial MPI openmp

*  Fixed Flake8 Issue  and remove Patch File

*  Fixed issues with openmp Flag

*  Edited Required Changes

* Fixed issues with flake8 and Added Conditional GCC Flags

* Fixed Flake 8 Issue

*  Fixed flag's issue with non GCC Compiler

*  Fixed condition and spacing issues
2017-08-10 20:08:56 -05:00
Audrey Thoma
2f29e9c18e braker & genemark-et: new packages (#5058)
* braker & genemark-et: new packages

* fixing install
2017-08-10 20:04:37 -05:00
Audrey Thoma
637f72a8fe fimpute: new package (#5060) 2017-08-10 20:04:10 -05:00
Audrey Thoma
967370aa0b impute2: new package (#5062) 2017-08-10 20:03:52 -05:00
Audrey Thoma
518993431d mothur: new package (#5055)
* mothur: new package

* fixing mpi things
2017-08-10 18:09:40 -05:00
Jim Galarowicz
df3bc3906d Update Krell products: Add new OpenSpeedShop gui package based on qt4/qt5 gui toolkit. (#5056)
* Update the krell institute products to use the latest features of spack for building on cluster platforms.

* Address travis error messages and resubmit the pull request.

* Update the contents of openspeedshop package.py so it passes the flake8 tests.

* Fix flake8 error-whitespack issue in mrnet package.py file.

* Add updates based on spack reviewer feedback.

* More fixes based on comments from reviewers.  Switch using extend to using append, remove additional setting of PATH and LD_LIBRARY_PATH that should not be required due to RPATH.

* More review related changes.  Update MPIOption.append lines and take out xercesc references.

* Create a base options function for common openspeedshop base cmake options to reduce redundencies.

* Add libxml2+python depends on to get around issues with the libxml2 package file.

* Using boost over 1.60.0 causes compile errors.  This is a known boost bug. Also, dyninst-9.2.0 is set to be the vesrion of dyninst to use with OSS, as of now. The newer version fails to build.

* Fix bad syntax in specifying the boost version range.

* Update the version numbers for the krell institute components and tools: cbtf and openspeedshop.

* Do not build glib for qt3, it is not needed and causes build problems at this time anyway.

* A fix was added for setting LD_LIBRARY_PATH in the qt3 build, but if LD_LIBRARY_PATH is not set the qt build fails. So so check and set LD_LIBRARY_PATH if not set, update if it is set.

* Update the fix for qt3 build by setting LD_LIBRARY_PATH instead of checking for whether it is set or not per Adams comment that spack clears LD_LIBRARY_PATH.

* A fix was added for setting LD_LIBRARY_PATH in the qt3 build, but if LD_LIBRARY_PATH is not set the qt build fails. So so check and set LD_LIBRARY_PATH if not set, update if it is set.

* Trim comments to fit more concisely.

* Fix tabs versus spaces and swap if and else clause check from a negative to a positive check.

* Add new OpenSpeedShop gui package based on qt4/qt5 gui toolkit.

* Fix flake8 errors.

* Fix flake8 errors.
2017-08-10 18:08:32 -05:00
Audrey Thoma
81a1d7b72b gblocks: new package (#5061) 2017-08-10 17:56:20 -05:00
Audrey Thoma
ee66c3a7aa kallisto: new package (#5063) 2017-08-10 17:54:29 -05:00
Audrey Thoma
e99834df6a fastphase: new package (#5059) 2017-08-10 17:51:46 -05:00
Michael Kuhn
887e4724c2 go: Fix cgo (#5052) 2017-08-10 09:42:02 -07:00
George Hartzell
c6cd447a8a Add version 2.19.1.403 to bcl2fastq2 package (#5047)
* Update bcl2fastq2 with info for 2.19.1.403

Heads up, the download location changed (domain name AND protocol).

* Flake8 fix

What's one space between friends?
2017-08-09 22:17:34 -05:00
Audrey Thoma
5bb86ce964 soapindel: new package (#5048)
* soapindel: new package

* fixed versioning
2017-08-09 21:39:06 -05:00
Jon Rood
58cdd46ebd Adding lower bound to pnetcdf conflict in Trilinos (#5039)
* Adding lower bound to pnetcdf conflict in Trilinos to allow for use of develop and master branch.

* Using even lower bound for pnetcdf conflict in Trilinos.
2017-08-09 18:50:28 -05:00
Audrey Thoma
869d40648f soap2: new package (#5045) 2017-08-09 18:50:11 -05:00
Audrey Thoma
3edf36b0a4 haploview: new package (#5036) 2017-08-09 17:03:14 -05:00
Audrey Thoma
7ca5e4f734 soapsnp: new package (#5046) 2017-08-09 17:00:59 -05:00
Brian Van Essen
28b0421eb1 Opencv fix (#5040)
* Added a package for the MDAnalysis toolkit.

* Changed cmake_options to args to be consistent with the rest of the
file and fix a cmake error about undefined errors.  Additionally,
added guards for both png and zlib to not include their cmake options
when those variants are not specified.
2017-08-09 15:40:10 -05:00
Audrey Thoma
0137f17306 shapeit: new package (#5042)
* shapeit: new package

* fixing versioning
2017-08-09 15:39:37 -05:00
Audrey Thoma
1f578c5777 pipits: new package (#5041)
* pipits: new package and dependencies

* fixing rdp-classifier java dep

* adding resources to pipits and fixing deps for py-biom-format
2017-08-09 15:04:21 -05:00
pkondamudi
9e8cce41e3 OpenMC parallel build fix. (#5037) 2017-08-09 11:11:09 -05:00
Denis Davydov
db4776fcd5 alglib: add new package (#5035) 2017-08-09 09:10:25 -07:00
Massimiliano Culpo
d6fc2363af slurm: added initial recipe (#4802)
* slurm: added initial recipe

* Modified variants following Adam comment.

The MV variant 'features' has been turned into a set of BV variants. The
dependency on 'readline' has been made optional.
2017-08-09 08:13:33 -05:00
Brian Homerding
a33f52cfb0 Fixed minor issues from Cmake conversion (#5024) 2017-08-08 23:47:34 -05:00