Commit Graph

19 Commits

Author SHA1 Message Date
Dana Robinson
46a9b495b4 [svn-r28585] Bring config/cmake/cacheinit.cmake in line with the trunk.
Tested on Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 w/ CMake 3.3.2
    serial only
2015-12-11 03:41:21 -05:00
Allen Byrne
dcda111779 [svn-r28074] Merge from trunk CMake code.
Also two fortran source files were changed.
2015-10-14 16:27:13 -05:00
Dana Robinson
d8fe8a2681 [svn-r27960] Autogen merges from trunk.
r27794, 27795, 27802, 27812, 27819, 27826, 27828, 27829, 27878
 27880, 27898, 27902

Tested on: local Linux
2015-10-05 23:15:00 -05:00
Dana Robinson
8a170f1c61 [svn-r27859] Merged revisions
27625, 27627, 27647, 27648, 27661, 27668, 27670, 27671, 27674, 27676,
27703, 27716, 27720, 27747, 27754, 27755

from the trunk.

Mostly CMake and Fortran changes.

Tested on: jam (w/ gcc/gfortran 4.9.3)
2015-09-22 15:44:16 -05:00
Dana Robinson
46fb5b6ccb [svn-r27840] Merged r27313, r27332, r27364, r27428, r27465, r27466 from trunk.
These are all CMake-only changes.

Tested on: N/A CMake still fails in this branch.
2015-09-21 05:02:58 -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
Vailin Choi
e0e28a7aae [svn-r26894] Bring revisions #26459 - #26785 from trunk to revise_chunks.
h5committested.
2015-04-22 17:31:12 -05:00
Vailin Choi
3a1c1caa0e [svn-r26362] Bring revisions #26109 - 26188 from trunk to revise_chunks.
h5committested.
2015-03-04 16:03:12 -05:00
Vailin Choi
a00ad64f46 [svn-r25825] Bring revisions #25509 - #25762 from trunk to revise_chunks.
h5committested.
2014-11-18 19:29:26 -05:00
Vailin Choi
9158e8aa03 [svn-r25342] Bring revisions #25120 - #25266 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
2014-06-23 15:24:08 -05:00
Vailin Choi
67ba5eb6e8 [svn-r25333] Bring revisions #24948 - #25120 from trunk to revise_chunks.
Tested on jam, ostrich, koala, platypus.
2014-06-19 15:09:06 -05:00
Vailin Choi
611d2c89af [svn-r25307] Bring revisions #24698 - #24783 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
2014-06-17 15:40:01 -05:00
Vailin Choi
e78fbfd2a2 [svn-r23959] Bring revisions #23745 - 23862 from trunk to revise_chunks.
h5committested.
2013-07-31 18:49:47 -05:00
Vailin Choi
0e1e79f0e0 [svn-r23601] Bring revisions #23341 - 23597 from trunk to revise_chunks.
h5committtested.
2013-04-19 12:24:43 -05:00
Quincey Koziol
cd3f42096b [svn-r22636] Description:
Bring r22599:22634 from trunk to revise_chunks branch

Tested on:
    Mac OSX/64 10.7.4 (amazon) w/gcc 4.7.x, C++ & FORTRAN
    (No need for h5committest yet on this branch)
2012-08-06 14:42:49 -05:00
Allen Byrne
046f1d7b1f [svn-r22522] Merge trunk revision 22520 cmake files and h5dump/h5diff and configure to branch 2012-07-06 14:16:07 -05:00
Quincey Koziol
eb89d7b53a [svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug
2012-03-21 10:10:17 -05:00
Quincey Koziol
727b687ae6 [svn-r20146] Description:
Bring r19714:20145 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.6 (amazon) in debug mode
        Mac OS X/32 10.6.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
2011-02-22 14:37:06 -05:00
Quincey Koziol
de3a870bcd [svn-r19110] Description:
Bring r19049:19109 from trunk to revise_chunks branch

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
2010-07-20 11:51:49 -05:00