diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-10-14 21:27:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-10-14 21:27:13 (GMT) |
| commit | dcda11177990040c790730808842c556f7ba16f7 (patch) | |
| tree | 4078a61ec4bc6f7bfd19e34f9c1ab2d25b2173e8 /CMakeLists.txt | |
| parent | cc261eb5e5cd016ec1529f44759f73cda2dc52bf (diff) | |
| download | hdf5-dcda11177990040c790730808842c556f7ba16f7.zip hdf5-dcda11177990040c790730808842c556f7ba16f7.tar.gz hdf5-dcda11177990040c790730808842c556f7ba16f7.tar.bz2 | |
[svn-r28074] Merge from trunk CMake code.
Also two fortran source files were changed.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1035142..88e58e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,10 +193,10 @@ endif (NOT HDF5_INSTALL_LIB_DIR) if (NOT HDF5_INSTALL_INCLUDE_DIR) set (HDF5_INSTALL_INCLUDE_DIR include) endif (NOT HDF5_INSTALL_INCLUDE_DIR) +option (HDF5_BUILD_FRAMEWORKS "TRUE to build as frameworks libraries, FALSE to build according to BUILD_SHARED_LIBS" FALSE) if (NOT HDF5_INSTALL_DATA_DIR) if (NOT WIN32) if (APPLE) - option (HDF5_BUILD_FRAMEWORKS "Create a Mac OSX Framework" OFF) if (HDF5_BUILD_FRAMEWORKS) set (HDF5_INSTALL_EXTRA_DIR ../SharedSupport) else (HDF5_BUILD_FRAMEWORKS) @@ -321,7 +321,6 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) #----------------------------------------------------------------------------- # Mac OS X Options #----------------------------------------------------------------------------- -option (HDF5_BUILD_FRAMEWORKS "TRUE to build as frameworks libraries, FALSE to build according to BUILD_SHARED_LIBS" TRUE) if (HDF5_BUILD_FRAMEWORKS AND NOT BUILD_SHARED_LIBS) set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries") endif (HDF5_BUILD_FRAMEWORKS AND NOT BUILD_SHARED_LIBS) @@ -558,20 +557,25 @@ if (WIN32) endif (HDF5_ENABLE_PARALLEL) if (HDF5_BUILD_FORTRAN) if (NOT ALLOW_UNSUPPORTED) - message (STATUS " **** Fortran and thread-safety options are not supported **** ") - message (STATUS " **** thread-safety option will not be used building Fortran library **** ") + message (FATAL_ERROR " **** Fortran and thread-safety options are not supported **** ") else (NOT ALLOW_UNSUPPORTED) message (STATUS " **** Allowing unsupported Fortran and thread-safety options **** ") endif (NOT ALLOW_UNSUPPORTED) endif (HDF5_BUILD_FORTRAN) if (HDF5_BUILD_CPP_LIB) if (NOT ALLOW_UNSUPPORTED) - message (STATUS " **** C++ and thread-safety options are not supported **** ") - message (STATUS " **** thread-safety option will not be used building C++ library **** ") + message (FATAL_ERROR " **** C++ and thread-safety options are not supported **** ") else (NOT ALLOW_UNSUPPORTED) message (STATUS " **** Allowing unsupported C++ and thread-safety options **** ") endif (NOT ALLOW_UNSUPPORTED) endif (HDF5_BUILD_CPP_LIB) + if (HDF5_BUILD_HL_LIB) + if (NOT ALLOW_UNSUPPORTED) + message (FATAL_ERROR " **** HL and thread-safety options are not supported **** ") + else (NOT ALLOW_UNSUPPORTED) + message (STATUS " **** Allowing unsupported HL and thread-safety options **** ") + endif (NOT ALLOW_UNSUPPORTED) + endif (HDF5_BUILD_HL_LIB) if (H5_HAVE_IOEO) message (STATUS " **** Win32 threads requires WINVER>=0x600 (Windows Vista/7/8) **** ") set (H5_HAVE_WIN_THREADS 1) |