diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-09-13 16:33:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-09-13 16:33:00 (GMT) |
| commit | cafab483ff373731e694096a9cdfdf262ed7cf5f (patch) | |
| tree | 86c040c1d1bfb7bea553b137228e9908b9458892 /config/cmake/ConfigureChecks.cmake | |
| parent | 2456a36f46a15ca44840cb64c7aac213f0ca8bf8 (diff) | |
| parent | 05f49d5ffdbd4cf9e967d60a3a0efd0ca7f2c820 (diff) | |
| download | hdf5-cafab483ff373731e694096a9cdfdf262ed7cf5f.zip hdf5-cafab483ff373731e694096a9cdfdf262ed7cf5f.tar.gz hdf5-cafab483ff373731e694096a9cdfdf262ed7cf5f.tar.bz2 | |
Merge pull request #1920 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '05f49d5ffdbd4cf9e967d60a3a0efd0ca7f2c820': (22 commits)
HDFFV-10854 add release note for windows
Fix get home dir for windows
Use variable for test output
Allow tests to dump output if not comparing
revert as CHECK will first check for exception
Clear exception for getting JNI string to clear the exception
Correct Windows check
revert windows change
Windows ssl headers are not in system loacation
Add include dirs and default lib for windows
Add policy to use <package>_ROOT
Add statement for label if code unimplemented
Update Windows require for CURL to CMake 3.13
Fix unused var
Add updated find module for earlier CMake versions
Correct label and var names
Add back missing java implementation
use h5test.h
add test library
special windows override
...
Diffstat (limited to 'config/cmake/ConfigureChecks.cmake')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index cb1eb48..7d0f429 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -159,11 +159,16 @@ endif () #----------------------------------------------------------------------------- option (HDF5_ENABLE_ROS3_VFD "Build the ROS3 Virtual File Driver" OFF) if (HDF5_ENABLE_ROS3_VFD) + # CMake version 3.13 fixed FindCURL module + if(CMAKE_VERSION VERSION_LESS "3.13.0" AND WIN32) + MESSAGE(FATAL_ERROR "Windows builds for this option requires a minimum of CMake 3.13") + endif () find_package(CURL REQUIRED) find_package(OpenSSL REQUIRED) if (${CURL_FOUND} AND ${OPENSSL_FOUND}) set (${HDF_PREFIX}_HAVE_ROS3_VFD 1) list (APPEND LINK_LIBS ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}) + INCLUDE_DIRECTORIES (${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR}) else () message (STATUS "The Read-Only S3 VFD was requested but cannot be built.\nPlease check that openssl and cURL are available on your\nsystem, and/or re-configure without option HDF5_ENABLE_ROS3_VFD.") endif () |