Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework Fortran configure to allow multiple CMake reruns #721

Merged
merged 240 commits into from
Jun 7, 2021
Merged
Show file tree
Hide file tree
Changes from 231 commits
Commits
Show all changes
240 commits
Select commit Hold shift + click to select a range
23e0df3
OESS-98 convert plugin option to FetchContent, add tests
byrnHDF Dec 10, 2020
84293f5
Fixes for pkcfg files because of plugin option
byrnHDF Dec 11, 2020
544bd61
OESS-98 fix tools test for plugins
byrnHDF Dec 15, 2020
ffb182f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 8, 2021
2561b6b
Keep doxygen comments under 100 chars long - format hint
byrnHDF Jan 8, 2021
1c73615
Whitespace
byrnHDF Jan 8, 2021
b71a853
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 11, 2021
b68973c
HDFFV-11144 - Reclassify CMake messages
byrnHDF Jan 11, 2021
f64497d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 13, 2021
c854ffe
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 14, 2021
0f90d26
HDFFV-11099/11100 added help text
byrnHDF Jan 14, 2021
20757d6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 15, 2021
d161733
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 20, 2021
f03b095
Reworked switch statement to compare string instead
byrnHDF Jan 22, 2021
bd52065
Fix typo
byrnHDF Jan 22, 2021
238c060
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 25, 2021
f12b2ae
Update CDash mode
byrnHDF Jan 26, 2021
673aac8
Correct name of threadsafe
byrnHDF Jan 26, 2021
97df6db
Correct option name
byrnHDF Jan 26, 2021
e48f758
Undo accidental commit
byrnHDF Jan 26, 2021
2f364d8
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 27, 2021
f42f02b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 27, 2021
5b48b33
Note LLVM 10 to 11 format default changes
byrnHDF Jan 27, 2021
9927372
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 28, 2021
ad61d57
Update format plugin
byrnHDF Jan 28, 2021
613bc7a
Undo clang-format version 11 changes
byrnHDF Jan 28, 2021
0114098
One more correction
byrnHDF Jan 28, 2021
a685efa
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 29, 2021
78f25ac
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 1, 2021
1899ba6
Update supported platforms
byrnHDF Feb 2, 2021
28d6d63
Revert whitespace changes
byrnHDF Feb 2, 2021
f1a0239
Correct whitespace
byrnHDF Feb 2, 2021
b656722
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 3, 2021
1c9eaf4
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 4, 2021
f85f7da
Changes from PR#3
byrnHDF Feb 4, 2021
464d08e
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 5, 2021
34ad32c
HDFFV-11213 added option to control gcc10 warnings diagnostics
byrnHDF Feb 5, 2021
d6db05b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into
byrnHDF Feb 8, 2021
264caff
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 9, 2021
9b42150
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 10, 2021
4569d39
HDFFV-11212 Use the new references correctly in JNI utility and tests
byrnHDF Feb 11, 2021
4a2865c
format source
byrnHDF Feb 11, 2021
1a2dc75
Fix typo
byrnHDF Feb 11, 2021
23679fa
Add new test file
byrnHDF Feb 11, 2021
232426b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 16, 2021
020a40c
HDFFV-11212 - update test and remove unused arg
byrnHDF Feb 16, 2021
2352972
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 17, 2021
5806658
Minor non-space formatting changes
byrnHDF Feb 18, 2021
83b619f
Use H5I_INVALID_ID instead of "-1"
byrnHDF Feb 19, 2021
fbf97be
source formatting
byrnHDF Feb 19, 2021
ea94075
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
797a6c2
add missing testfile, update jni function
byrnHDF Feb 19, 2021
32d6ee9
Undo commit of debug code
byrnHDF Feb 19, 2021
71c4557
remove mislocated file
byrnHDF Feb 19, 2021
2c6df43
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
66d54a9
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
08c7738
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
46c620f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 22, 2021
a4132c8
Fix h5repack test for handling of fapls and id close
byrnHDF Feb 22, 2021
498d7ec
Update h5diff test files usage text
byrnHDF Feb 22, 2021
82ff537
HDFFV-11212 add new ref tests for JNI export dataset
byrnHDF Feb 22, 2021
7e81307
src format update
byrnHDF Feb 22, 2021
4bda56f
Remove blank line typo
byrnHDF Feb 22, 2021
25884a6
src format typo
byrnHDF Feb 22, 2021
07d8cf2
long double requires %Lg
byrnHDF Feb 22, 2021
8735c2a
Another long double foramt specifer S.B. %Lg
byrnHDF Feb 22, 2021
140aca0
issue with t128bit test
byrnHDF Feb 22, 2021
c790f17
Windows issue with h5dump and type.
byrnHDF Feb 22, 2021
eb3f7cc
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 23, 2021
76d4fba
Fix review issues
byrnHDF Feb 23, 2021
7b96c23
refactor function nesting and fix error checks
byrnHDF Feb 23, 2021
90bb747
format fixes
byrnHDF Feb 23, 2021
321b926
Remove untested functions and javadoc quiet comments
byrnHDF Feb 23, 2021
2d40134
Restore TRY block.
byrnHDF Feb 24, 2021
b8cda57
Change string append errors to memory exception
byrnHDF Feb 24, 2021
ec3c879
revert to H5_JNI_FATAL_ERROR - support functions need work
byrnHDF Feb 24, 2021
0a56190
Add assertion error for h5util functions
byrnHDF Feb 24, 2021
282ac70
remove duplicate function
byrnHDF Feb 24, 2021
9eae4f5
format fix
byrnHDF Feb 24, 2021
a3d7f13
Revert HD function error handling
byrnHDF Feb 24, 2021
3ea3719
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 25, 2021
2a71393
Update copyright comments
byrnHDF Feb 25, 2021
68d7443
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 25, 2021
dab6971
GH #386 java folder copyright corrections
byrnHDF Feb 26, 2021
bfa3508
Whitespace
byrnHDF Feb 26, 2021
b42646f
GH #359 implement and fix tools 1.6 API usage
byrnHDF Feb 26, 2021
f10a3a1
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 26, 2021
6d17d6f
remove excessive comments
byrnHDF Feb 26, 2021
a9bd5ba
Flip inits to correct ifdef section
byrnHDF Feb 26, 2021
7037609
rework ifdef to be simpler
byrnHDF Feb 26, 2021
9e7b3d7
format issue
byrnHDF Feb 26, 2021
d76e848
Reformat ifdef inits
byrnHDF Feb 26, 2021
49e5203
remove static attribute
byrnHDF Feb 26, 2021
53a1528
format compliance
byrnHDF Feb 26, 2021
bb01c7b
Update names
byrnHDF Feb 28, 2021
70a7b81
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 1, 2021
97ed2a4
Revert because logic relies on float not being int
byrnHDF Mar 1, 2021
f19f7d6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 1, 2021
2998e91
Changes noticed from creating merge of #412
byrnHDF Mar 2, 2021
5b6e1af
Double underscore change
byrnHDF Mar 2, 2021
e478961
Correct compiler version variable used
byrnHDF Mar 3, 2021
f00ce36
Remove header guard underscores
byrnHDF Mar 3, 2021
24db13a
Whitespace cleanup
byrnHDF Mar 3, 2021
1309524
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 4, 2021
0b04714
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 5, 2021
e460b2b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 5, 2021
c7115cd
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 8, 2021
746ab82
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 10, 2021
d429b3f
Split format source and commit changes on repo push
byrnHDF Mar 10, 2021
9029a70
remove pre-split setting
byrnHDF Mar 10, 2021
04284c1
Change windows TS to use older VS.
byrnHDF Mar 10, 2021
33f8693
correct window os name
byrnHDF Mar 10, 2021
723aa6d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 10, 2021
49f92f0
HDFFV-11212 JNI export util and Javadoc
byrnHDF Mar 11, 2021
b6d4127
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 11, 2021
e555eb6
Suggested review changes
byrnHDF Mar 11, 2021
720c393
Another change found
byrnHDF Mar 11, 2021
c3bd691
Committing clang-format changes
github-actions[bot] Mar 11, 2021
a57c9b7
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 12, 2021
cadc876
HDFFV-11113 long double in tools
byrnHDF Mar 12, 2021
fdd4a51
HDFFV-11113 add note
byrnHDF Mar 12, 2021
efe338b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 15, 2021
421ab67
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 17, 2021
d67f8d3
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 18, 2021
e6972f2
Disable long double tests for now
byrnHDF Mar 22, 2021
866da1a
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 22, 2021
ef237e4
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 22, 2021
3691b55
HDFFV-11228 remove arbitrary CMake warning groups.
byrnHDF Mar 22, 2021
fdd06ab
Make each flag a string
byrnHDF Mar 22, 2021
fd83148
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 22, 2021
f1cd80f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 23, 2021
742a7e3
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 24, 2021
d3f4392
Some Javadoc warning fixes
byrnHDF Mar 24, 2021
9c3becc
Updated javadoc fixes
byrnHDF Mar 24, 2021
bb93f4d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 25, 2021
04568ab
# WARNING: head commit changed in the meantime
byrnHDF Mar 25, 2021
23aaf37
Committing clang-format changes
github-actions[bot] Mar 25, 2021
511bf0e
HDFFV-11229 Add release note
byrnHDF Mar 25, 2021
e8d97c9
HDFFV-11229 windows testfile needed
byrnHDF Mar 25, 2021
69e1491
fix typo
byrnHDF Mar 25, 2021
e3de592
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 26, 2021
3d88c6a
Remove non supported message text
byrnHDF Mar 26, 2021
fe9d07c
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 26, 2021
452b890
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 29, 2021
f4e1413
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 30, 2021
8c6e61f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 31, 2021
ab3ae07
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 31, 2021
c9a8d50
HDFFV-11229 - change ldouble test to check both native and general
byrnHDF Apr 5, 2021
72fd93d
HDFFV-11229 add second file compare
byrnHDF Apr 5, 2021
dff390e
HDFFV-11229 fix reference file
byrnHDF Apr 5, 2021
362beb3
HDFFV-11229 autotools check two refs
byrnHDF Apr 5, 2021
2385150
HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output
byrnHDF Apr 7, 2021
c17ca54
Committing clang-format changes
github-actions[bot] Apr 7, 2021
f05c84e
Update release note
byrnHDF Apr 7, 2021
1e6224c
Update attribute type of ref file
byrnHDF Apr 7, 2021
baf0fd3
Change source of ninja for macs
byrnHDF Apr 12, 2021
6d780f6
try port instead of brew
byrnHDF Apr 12, 2021
c2cf490
Recommended is to use brew.
byrnHDF Apr 12, 2021
2e0f725
Undo non long double changes
byrnHDF Apr 13, 2021
e97e2e8
remove unneeded file
byrnHDF Apr 13, 2021
3756724
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 15, 2021
292a651
Fix perl and doxygen CMake code
byrnHDF Apr 15, 2021
b34207a
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 19, 2021
097fe10
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 19, 2021
d9fe955
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 20, 2021
dcc8bf6
Add "option" command for clang options
byrnHDF Apr 20, 2021
fefc0c6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 21, 2021
39b2ba4
Rework CMake add_custom to use the BYPRODUCTS argument
byrnHDF Apr 21, 2021
9a9712f
Add stamp files to BYPRODUCTS
byrnHDF Apr 21, 2021
65faa84
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 22, 2021
3bf4120
Only one copy of file exists
byrnHDF Apr 22, 2021
3994af6
Fix custom cmmand depends targets
byrnHDF Apr 23, 2021
dd70b67
Fix fortran custom command DEPENDS
byrnHDF Apr 23, 2021
a956363
Add LD_LIBRARY_PATH to tests
byrnHDF Apr 23, 2021
251327f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 25, 2021
7f6e7d4
Add custom target for DEPENDS
byrnHDF Apr 26, 2021
f0890ff
Add h5detect conditionaly to generated target DEPENDS
byrnHDF Apr 26, 2021
55facca
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 26, 2021
0a48437
Correct DEPENDS targets
byrnHDF Apr 26, 2021
b15b171
Parallel builds need the mpi compiler for pkgconfig scripts.
byrnHDF Apr 26, 2021
7e14d75
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 26, 2021
3d13618
install only if MPI build
byrnHDF Apr 26, 2021
cc0354a
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 27, 2021
afaf507
Fortran target depends
byrnHDF Apr 28, 2021
1962f34
Remove incorrect source attribute
byrnHDF Apr 28, 2021
db9e593
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 29, 2021
1166945
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 29, 2021
165d7a6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Apr 30, 2021
7a3dc35
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 3, 2021
e44b69d
doxygen adjustments
byrnHDF May 3, 2021
b398d41
doxygen build updates
byrnHDF May 4, 2021
0c6fa9c
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 4, 2021
c8d8b3e
Correct version
byrnHDF May 4, 2021
ec88e07
Correct function version - function has been merged to 1.12
byrnHDF May 4, 2021
dffcfcb
Correct version string for map functions
byrnHDF May 4, 2021
e442558
Cleanup warnings for tools debug builds
byrnHDF May 5, 2021
6542d2d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 5, 2021
ac65535
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 5, 2021
4fa95da
TRILAB-227 - fix indexing for h5diff selections
byrnHDF May 5, 2021
a5347ee
Correct location of pos to index function call
byrnHDF May 6, 2021
76baa89
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 7, 2021
4cdf695
TRILAB-227 Enable test
byrnHDF May 7, 2021
8827276
Quote subset args
byrnHDF May 7, 2021
02c2ade
Use MATCHES because of AppleClang
byrnHDF May 15, 2021
e2d1e0f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 15, 2021
16ca108
Merge branch 'HDFGroup:develop' into develop
byrnHDF May 18, 2021
d6c94b1
if blocks needed for build modes
byrnHDF May 18, 2021
bcee9ac
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 18, 2021
9a94ffc
Update list of DT platforms
byrnHDF May 18, 2021
5c9dbba
VS2019 correctly displays float values
byrnHDF May 20, 2021
627d9ba
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 20, 2021
24b817f
revert VS2019 change
byrnHDF May 20, 2021
905c818
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 21, 2021
c12d801
Issue #669 remove version from pkgcfg filename
byrnHDF May 21, 2021
ed42298
remove version from h5cc script
byrnHDF May 21, 2021
60b0a5a
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 25, 2021
4a2871f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF May 26, 2021
6a8f13d
Java reference functions updated
byrnHDF May 27, 2021
86641e8
Correct BYPRODUCTS argument
byrnHDF May 27, 2021
347f605
Correct more genereated files BYPRODUCTS
byrnHDF May 27, 2021
85f2432
BYPRODUCTS must have unique locations
byrnHDF May 27, 2021
7170b7d
Fix typo
byrnHDF May 27, 2021
58a5fae
Merge branch 'HDFGroup:develop' into develop
byrnHDF May 27, 2021
245658c
Merge branch 'HDFGroup:develop' into develop
byrnHDF Jun 1, 2021
b31fc97
Merge branch 'HDFGroup:develop' into develop
byrnHDF Jun 1, 2021
18bb4cb
Merge branch 'HDFGroup:develop' into develop
byrnHDF Jun 2, 2021
69e833c
Merge branch 'HDFGroup:develop' into develop
byrnHDF Jun 3, 2021
eb8baef
Fix fortran configure checks
byrnHDF Jun 3, 2021
3304c2b
Rework H5_PAC_C_MAX_REAL_PRECISION setting logic
byrnHDF Jun 3, 2021
eed910d
Add note about fortran configure change
byrnHDF Jun 3, 2021
d967b91
Merge branch 'HDFGroup:develop' into develop
byrnHDF Jun 3, 2021
d56cd71
Adds a quick for for some egregious chunk_info badness (#722)
derobins Jun 3, 2021
eca5f13
Fixes issue with ccmake that prevents building Fortran (#723)
derobins Jun 4, 2021
aaeface
Fix conflicts with merge
byrnHDF Jun 4, 2021
7b3e4a7
Merge branch 'HDFGroup:develop' into develop
byrnHDF Jun 4, 2021
cad37d8
Move MAX_PRECISION back to HDF5UseFortran.cmake
byrnHDF Jun 4, 2021
6ab15cc
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jun 6, 2021
670db50
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jun 7, 2021
18a9555
Use STREQUAL to test macro argument
byrnHDF Jun 7, 2021
21ef111
Move C language test to ConfigureChecks from HDF5UseFortran
byrnHDF Jun 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 111 additions & 4 deletions config/cmake/ConfigureChecks.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -213,18 +213,125 @@ endif()
# Check if C has __float128 extension
#-----------------------------------------------------------------------------

CHECK_TYPE_SIZE("__float128" ${HDF_PREFIX}_SIZEOF___FLOAT128)
if (${${HDF_PREFIX}_SIZEOF___FLOAT128})
HDF_CHECK_TYPE_SIZE(__float128 _SIZEOF___FLOAT128)
if (${_SIZEOF___FLOAT128})
set (${HDF_PREFIX}_HAVE_FLOAT128 1)
set (${HDF_PREFIX}_SIZEOF___FLOAT128 ${_SIZEOF___FLOAT128})
else ()
set (${HDF_PREFIX}_HAVE_FLOAT128 0)
set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
endif ()

CHECK_TYPE_SIZE("_Quad" ${HDF_PREFIX}_SIZEOF__QUAD)
if (NOT ${${HDF_PREFIX}_SIZEOF__QUAD})
HDF_CHECK_TYPE_SIZE(_Quad _SIZEOF__QUAD)
if (NOT ${_SIZEOF__QUAD})
set (${HDF_PREFIX}_SIZEOF__QUAD 0)
else ()
set (${HDF_PREFIX}_SIZEOF__QUAD ${_SIZEOF__QUAD})
endif ()

#-----------------------------------------------------------------------------
# The provided CMake C macros don't provide a general compile/run function
# so this one is used.
#-----------------------------------------------------------------------------
macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This macro and tests moved from HDF5UseFortran.cmake

if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
message (VERBOSE "Detecting C ${FUNCTION_NAME}")
endif ()
file (WRITE
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
${SOURCE_CODE}
)
TRY_RUN (RUN_RESULT_VAR COMPILE_RESULT_VAR
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
COMPILE_DEFINITIONS "-D_SIZEOF___FLOAT128=${H5_SIZEOF___FLOAT128};-D_HAVE_QUADMATH_H=${H5_HAVE_QUADMATH_H}"
COMPILE_OUTPUT_VARIABLE COMPILEOUT
RUN_OUTPUT_VARIABLE OUTPUT_VAR
)

set (${RETURN_VAR} ${OUTPUT_VAR})

if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
message (VERBOSE "Test COMPILE_RESULT_VAR ${COMPILE_RESULT_VAR} ")
message (VERBOSE "Test COMPILE_OUTPUT ${COMPILEOUT} ")
message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
message (VERBOSE "Test RUN_RESULT_VAR ${RUN_RESULT_VAR} ")
message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
endif ()

if (${COMPILE_RESULT_VAR})
if (${RUN_RESULT_VAR} MATCHES 0)
set (${RUN_RESULT_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
message (VERBOSE "Testing C ${FUNCTION_NAME} - OK")
endif ()
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the C ${FUNCTION_NAME} exists passed with the following output:\n"
"${OUTPUT_VAR}\n\n"
)
else ()
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail")
endif ()
set (${RUN_RESULT_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n"
"${OUTPUT_VAR}\n\n")
endif ()
else ()
message (FATAL_ERROR "Compilation of C ${FUNCTION_NAME} - Failed")
endif ()
endmacro ()

set (PROG_SRC
"
#include <float.h>\n\
#include <stdio.h>\n\
#define CHECK_FLOAT128 _SIZEOF___FLOAT128\n\
#if CHECK_FLOAT128!=0\n\
#if _HAVE_QUADMATH_H!=0\n\
#include <quadmath.h>\n\
#endif\n\
#ifdef FLT128_DIG\n\
#define C_FLT128_DIG FLT128_DIG\n\
#else\n\
#define C_FLT128_DIG 0\n\
#endif\n\
#else\n\
#define C_FLT128_DIG 0\n\
#endif\n\
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n\
#define C_LDBL_DIG DECIMAL_DIG\n\
#else\n\
#define C_LDBL_DIG LDBL_DIG\n\
#endif\n\nint main() {\nFILE *pFile = fopen(\"pac_Cconftest.out\",\"w\")\\\;\nfprintf(pFile, \"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
"
)

C_RUN ("maximum decimal precision for C" ${PROG_SRC} PROG_RES)
file (READ "${CMAKE_BINARY_DIR}/pac_Cconftest.out" PROG_OUTPUT4)
message (STATUS "Testing maximum decimal precision for C - ${PROG_OUTPUT4}")

# dnl The output from the above program will be:
# dnl -- long double decimal precision -- __float128 decimal precision

list (GET PROG_OUTPUT4 0 H5_LDBL_DIG)
list (GET PROG_OUTPUT4 1 H5_FLT128_DIG)

if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL 0 OR FLT128_DIG EQUAL 0)
set (${HDF_PREFIX}_HAVE_FLOAT128 0)
set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
set (_PAC_C_MAX_REAL_PRECISION ${H5_LDBL_DIG})
else ()
set (_PAC_C_MAX_REAL_PRECISION ${H5_FLT128_DIG})
endif ()
if (NOT ${_PAC_C_MAX_REAL_PRECISION})
set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION 0)
else ()
set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION ${_PAC_C_MAX_REAL_PRECISION})
endif ()
message (STATUS "maximum decimal precision for C var - ${${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION}")

#-----------------------------------------------------------------------------
# Macro to determine the various conversion capabilities
Expand Down
Loading