Commit Graph

2 Commits

Author SHA1 Message Date
Dana Robinson
8a1ca95768 [svn-r28216] Merge of r27969:28132, 28144:28193 from trunk.
Mostly CMake changes, but there's also a few minor library
changes.

Temporarily commented out the accum test. The test builds
but one of the sub-tests fails due to a file issue.

Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
           serial w/autotools
           serial w/CMake (3.3.2, w/ fortran and C++)
2015-10-25 23:49:56 -05:00
Dana Robinson
291bf20529 [svn-r27522] CMake files match those of the trunk but still need to be updated with changes in this branch.
Tested on: NONE (CMake is still broken in this branch)
2015-08-19 05:54:48 -05:00