Commit Graph

43 Commits

Author SHA1 Message Date
Allen Byrne
666205a55f TRILAB-142 Change minimum CMake version to 3.12 2020-02-21 16:16:06 -06:00
Allen Byrne
a0ae5e9b89 HDFFV-11001 Add fine control over testing 2020-01-15 11:38:06 -06:00
Allen Byrne
e7f16c6f2c HDFFV-10805 Add option to only build shared targets
HDFFV-10805 Add ONLY_SHARED_LIBS option and prefer shared over static
HDFFV-10803 Update FindSZIP.cmake find module
Remove unneeded modules and update java modules
2019-06-18 07:46:25 -05:00
Dana Robinson
dec2f588ac Merge pull request #1043 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5do_direct_chunk_hl_to_src to develop
* commit '1da9c5545c013ebc540ba3044810889d4acfa5be':
  Restored some unused #defines to the deprecated section of H5Dpublic.h.
  Added deprecated symbol wrappers for the H5DOwrite/read_chunk wrappers.
  Updated commenting in the H5DO compat test.
  Stripped out most of the duplicated functionality in the H5DO compat test.
  * Added H5DO compatibility functions. * Changed the offset copy to use an array on the stack. * Yanked some unused #defines.
  * Fixed the error tests * Moved common functionality into helper functions
  Normalize with trunk prior to update merge
  Fixed a warning.
  Finished move of H5DOread/write_chunk calls to H5D.
  First stage of moving H5DOread/write_chunk() to src/ and making them H5D calls. * Moved H5DOread/write_chunk() to H5Dio.c and renamed to H5D*. * Moved the hl/test/test_dset_opt test to test/ and renamed to   direct_chunk. * Moved the hl/test/dectris_hl_perf test to tools/test/perform   and renamed to direct_write_perf. * Updated autotools and CMake files.
2018-05-31 18:14:24 -05:00
Dana Robinson
0e584c7af2 Merge branch 'develop' into h5do_direct_chunk_hl_to_src 2018-05-14 17:45:23 -07:00
Allen Byrne
37c27afde0 Fix MPI on Windows by adding MPI include folder 2018-05-09 14:29:44 -05:00
Dana Robinson
1fa0c5a4b5 * Added H5DO compatibility functions.
* Changed the offset copy to use an array on the stack.
* Yanked some unused #defines.
2018-05-04 09:01:54 -07:00
Dana Robinson
64e13ca220 Merge branch 'develop' into h5do_direct_chunk_hl_to_src 2018-04-30 15:22:09 -07:00
Dana Robinson
09b1106e39 First stage of moving H5DOread/write_chunk() to src/ and making
them H5D calls.
* Moved H5DOread/write_chunk() to H5Dio.c and renamed to H5D*.
* Moved the hl/test/test_dset_opt test to test/ and renamed to
  direct_chunk.
* Moved the hl/test/dectris_hl_perf test to tools/test/perform
  and renamed to direct_write_perf.
* Updated autotools and CMake files.
2018-04-30 07:52:07 -07:00
Allen Byrne
2347bffaa2 TRILABS-19 remove add_defintions and use generator expressions 2018-04-26 16:41:04 -05:00
Allen Byrne
6c82c49dd5 TRILABS-20 set a compiler name on all project commands 2018-04-20 10:11:55 -05:00
Allen Byrne
46f2a2a432 TRILABS-19 Initial conversion of include_directories to targets 2018-04-17 15:57:58 -05:00
Allen Byrne
24c62ba7fe Change CMake min to 3.10 2018-03-09 12:32:06 -06:00
Allen Byrne
b36bad53d9 Inc CMake min, Add new tests, rework test CMake files 2018-02-27 12:57:07 -06:00
Allen Byrne
6ca95c512a HDFFV-10385 rework java names 2018-01-17 10:27:00 -06:00
Allen Byrne
e1bcae8a6a Update cmake min version and cmake command convention 2017-01-10 17:10:03 -06:00
Allen Byrne
27feb0357f Fix h5test.h include issue 2016-12-28 15:03:17 -06:00
Allen Byrne
0c0d6bd4df [svn-r29878] Add LD tests to CMake.
Add include guards and Windows guards to dectris_hl_perf.c file.
2016-05-04 11:14:45 -05:00
Allen Byrne
1f10dc7f11 [svn-r29272] Add code to deal with two source files for test_packet test. 2016-03-04 15:12:05 -05:00
Allen Byrne
4d0187a483 [svn-r27465] Merge dual-binary CMake changes 2015-08-05 10:56:58 -05:00
Allen Byrne
99baa66184 [svn-r26699] Generators are only built static 2015-04-01 16:02:43 -05:00
Allen Byrne
451a91e53b [svn-r26594] Merge macros and fortran changes from dual_binary feature.
Tested: local linux
2015-03-25 17:08:46 -05:00
Allen Byrne
73bb11dda3 [svn-r26208] Update cmake minimums 2015-02-18 11:56:22 -05:00
Allen Byrne
f5689224b5 [svn-r24789] Bump up the minimum cmake version 2014-03-13 10:05:09 -05:00
Allen Byrne
6c5e74942d [svn-r24782] HDFFV-8700 -
KitWare recommendations: Change CMake commands to lower case.
2014-03-11 17:07:13 -05:00
Allen Byrne
a3292a77ce [svn-r24781] HDFFV-8700 -
KitWare recommendations: Change CMake commands to lower case.
Remove INCLUDE_DIRECTORIES in src for target level includes.
Change ADD_DEFINITIONS package debug defines into CMake option.
Remove -DNDEBUG
2014-03-11 16:14:57 -05:00
Allen Byrne
c502d81a8c [svn-r24029] Move TESTS to seperate file to allow easier editing by all developers.
Tested: local linux
2013-08-19 16:49:44 -05:00
Allen Byrne
feb14ea872 [svn-r23745] HDFFV-8461: Add Windows /MT support
This adds the UserMacros.cmake support needed.
2013-06-10 12:46:48 -05:00
Allen Byrne
0596de6267 [svn-r23412] Add test depends on clear test. Occasional failures. 2013-03-21 09:19:09 -05:00
Raymond Lu
c9aad08a90 [svn-r23161] ported revisions 23146:23160 from the trunk 2013-01-14 14:45:59 -05:00
Raymond Lu
81bcd314a9 [svn-r23147] ported revisions 23081:23145 from the trunk 2013-01-09 15:23:07 -05:00
Raymond Lu
c409265f9d [svn-r23082] I corrected an error for test_dectris.h5.
Tested on jam.
2012-12-06 14:48:50 -05:00
Raymond Lu
6b1ef6ad02 [svn-r23079] I updated CMakefile for adding H5DO.c and H5DOpublic.h under hl/ directory.
Not test.
2012-12-05 16:11:49 -05:00
Allen Byrne
cc3eb8da73 [svn-r21804] Update CMake Required version in all folders to match current standard 2.8.6 2011-12-05 11:19:09 -05:00
Allen Byrne
c5e075851a [svn-r21667] Update FOLDER solution option for target properties. Added OPTION command for solution folder and no packaging.
Tested: local linux
2011-10-25 11:52:58 -05:00
Allen Byrne
05dfc85de8 [svn-r20153] Move ext lib handling for ext project building to a common macro. Update HDF5 project to use HDFMacros.cmake file. Add test properties for test ordering.
Tested: local linux, windows
2011-02-24 14:43:07 -05:00
Allen Byrne
9449cfa361 [svn-r19907] Windows: Correct how fortran links in CRT library. Also correct macro use for checking libtype.
bring r19906 from 1.8 branch
2011-01-04 13:40:26 -05:00
Allen Byrne
86313eb281 [svn-r19895] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries. 2010-12-29 13:52:34 -05:00
Allen Byrne
1f2c4afe77 [svn-r19527] Add clear generated objects commands to test blocks.
Add configurefile command to copy CTestCustom to build folder.

Tested: local linux
2010-10-06 15:49:54 -05:00
Allen Byrne
bed1276413 [svn-r19361] Move Windows specific compile and link flags to macros 2010-09-09 11:30:23 -05:00
Allen Byrne
e65aa8c365 [svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).

Tested: local linux with mpich
2010-08-31 15:15:13 -05:00
Allen Byrne
2f13382883 [svn-r19037] Added executable Linker Flag for MSVC static builds: /NODEFAULTLIB:MSVCRT
Added VERSION vars for inclusion into auto snapshot version update script

Tested windows
2010-06-29 15:09:03 -05:00
Allen Byrne
ae06433ab0 [svn-r18793] Add files to support building library with CMake
Tested: Local linux
2010-05-13 11:01:50 -05:00