diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-07 17:26:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-07 17:26:44 (GMT) |
| commit | ab2d9f1e9c44502f6dfe69969974a99d2953159d (patch) | |
| tree | 32d9a9298ab53b766baf1486704ca4ddd9b61d4b /CMakeLists.txt | |
| parent | fadc2d8c61c975cd6a64443ffbaa9ff6999a2419 (diff) | |
| download | hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.zip hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.gz hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.bz2 | |
[svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 33010aa..3708ac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -449,9 +449,9 @@ if (HDF5_DISABLE_COMPILER_WARNINGS) string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w") endif (MSVC) - if (WIN32 AND NOT CYGWIN) + if (WIN32) add_definitions (-D_CRT_SECURE_NO_WARNINGS) - endif (WIN32 AND NOT CYGWIN) + endif (WIN32) # Borland uses -w- to suppress warnings. if (BORLAND) set (HDF5_WARNINGS_BLOCKED 1) @@ -713,27 +713,34 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED) #----------------------------------------------------------------------------- # Option to use threadsafe -# Note: Currently CMake only allows configuring of threadsafe on WINDOWS. +# Note: Currently CMake only allows configuring of threadsafe on +# non-Cygwin WINDOWS. #----------------------------------------------------------------------------- -if (WIN32 AND NOT CYGWIN) - option (HDF5_ENABLE_THREADSAFE "Enable Threadsafety" OFF) +if (WIN32) + option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF) if (HDF5_ENABLE_THREADSAFE) # check for unsupported options if (HDF5_ENABLE_PARALLEL) - message (FATAL_ERROR " **** Parallel and Threadsafe options are mutually exclusive **** ") + message (FATAL_ERROR " **** parallel and thread-safety options are mutually exclusive **** ") endif (HDF5_ENABLE_PARALLEL) + if (HDF5_BUILD_FORTRAN) + message (FATAL_ERROR " **** Fortran and thread-safety options are mutually exclusive **** ") + endif (HDF5_BUILD_FORTRAN) + if (HDF5_BUILD_CPP_LIB) + message (FATAL_ERROR " **** C++ and thread-safety options are mutually exclusive **** ") + endif (HDF5_BUILD_CPP_LIB) set (H5_HAVE_THREADSAFE 1) if (H5_HAVE_IOEO) - message (STATUS " **** Windows Threads only available in WINVER>=0x600 (Vista or Windows 7) **** ") + message (STATUS " **** Win32 threads requires WINVER>=0x600 (Windows Vista/7/8) **** ") set (H5_HAVE_WIN_THREADS 1) else (H5_HAVE_IOEO) if (NOT H5_HAVE_PTHREAD_H) set (H5_HAVE_THREADSAFE 0) - message (FATAL_ERROR " **** Threadsafe option requires thread library **** ") + message (FATAL_ERROR " **** thread-safe option requires Win32 threads or Pthreads **** ") endif (NOT H5_HAVE_PTHREAD_H) endif (H5_HAVE_IOEO) endif (HDF5_ENABLE_THREADSAFE) -endif (WIN32 AND NOT CYGWIN) +endif (WIN32) #----------------------------------------------------------------------------- # Add the HDF5 Library Target to the build |