diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-10-23 16:00:36 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-10-23 16:00:36 (GMT) |
| commit | b6e61e8310a1e0a14de6f427b853716d447af373 (patch) | |
| tree | a3027959709ea591619ca067776c64f02a563c06 /config/cmake_ext_mod | |
| parent | ea2a969ce2a3a7dea80fcb2e5798da9307f04937 (diff) | |
| download | hdf5-b6e61e8310a1e0a14de6f427b853716d447af373.zip hdf5-b6e61e8310a1e0a14de6f427b853716d447af373.tar.gz hdf5-b6e61e8310a1e0a14de6f427b853716d447af373.tar.bz2 | |
Merge CMake changes from develop
Improved cross-compiling and toolchains
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index 4204511..40f1440 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -273,7 +273,7 @@ if (NOT WINDOWS) set (HDF_EXTRA_C_FLAGS -D_GNU_SOURCE) option (HDF_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) - if (HDF_ENABLE_LARGE_FILE) + if (HDF_ENABLE_LARGE_FILE AND NOT DEFINED TEST_LFS_WORKS_RUN) set (msg "Performing TEST_LFS_WORKS") TRY_RUN (TEST_LFS_WORKS_RUN TEST_LFS_WORKS_COMPILE ${CMAKE_BINARY_DIR} @@ -563,7 +563,7 @@ endif () if (WINDOWS) if (NOT HDF_NO_IOEO_TEST) message (STATUS "Checking for InitOnceExecuteOnce:") - if (NOT DEFINED ${${HDF_PREFIX}_HAVE_IOEO}) + if (NOT DEFINED ${HDF_PREFIX}_HAVE_IOEO) if (LARGEFILE) set (CMAKE_REQUIRED_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE" |