diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-17 12:45:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-17 12:45:55 (GMT) |
| commit | 6747ebd9858374ae912b6182024861b1710518c8 (patch) | |
| tree | 9bd75142d9dd292fe4272118f650f1c91205a988 /CMakeLists.txt | |
| parent | 9de3a84f916168831f29a4259fe93cb4823d8f57 (diff) | |
| download | hdf5-6747ebd9858374ae912b6182024861b1710518c8.zip hdf5-6747ebd9858374ae912b6182024861b1710518c8.tar.gz hdf5-6747ebd9858374ae912b6182024861b1710518c8.tar.bz2 | |
[svn-r19413] Description:
Bring r19349:19411 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8401c6e..b8bfb33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,17 +304,25 @@ ENDIF (MAKE_SYSTEM) IF (CMAKE_BUILD_TYPE MATCHES Debug) ADD_DEFINITIONS (-DDEBUG) ADD_DEFINITIONS ( - -DH5_DEBUG_API -DH5Z_DEBUG -DH5V_DEBUG -DH5T_DEBUG + -DH5Z_DEBUG -DH5V_DEBUG -DH5T_DEBUG -DH5S_DEBUG -DH5P_DEBUG -DH5O_DEBUG -DH5MM_DEBUG -DH5MF_DEBUG -DH5I_DEBUG -DH5HL_DEBUG -DH5HG_DEBUG -DH5G_DEBUG -DH5F_DEBUG -DH5E_DEBUG -DH5D_DEBUG -DH5B_DEBUG -DH5AC_DEBUG -UNDEBUG ) + OPTION (HDF5_ENABLE_TRACE "Enable API tracing capability" ON) + IF (HDF5_ENABLE_TRACE) + ADD_DEFINITIONS (-DH5_DEBUG_API ) + ENDIF (HDF5_ENABLE_TRACE) #-- NMake Makefiles will overwhelm the console with warnings if -Wall is used. IF (NOT WIN32) ADD_DEFINITIONS (-Wall) ENDIF (NOT WIN32) ELSE (CMAKE_BUILD_TYPE MATCHES Debug) ADD_DEFINITIONS (-UH5_DEBUG_API -DNDEBUG) + OPTION (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF) + IF (HDF5_ENABLE_TRACE) + ADD_DEFINITIONS (-DH5_DEBUG_API ) + ENDIF (HDF5_ENABLE_TRACE) ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) #----------------------------------------------------------------------------- @@ -510,6 +518,18 @@ IF (WIN32) ENDIF (WIN32) #----------------------------------------------------------------------------- +# Option to use threadsafe +# Note: Currently CMake only allows configuring of threadsafe on WINDOWS. +#----------------------------------------------------------------------------- +IF (WIN32) + OPTION (HDF5_ENABLE_THREADSAFE "Enable Threadsafety" OFF) + IF (HDF5_ENABLE_THREADSAFE) + SET (H5_HAVE_WIN_THREADS 1) + SET (H5_HAVE_THREADSAFE 1) + ENDIF (HDF5_ENABLE_THREADSAFE) +ENDIF (WIN32) + +#----------------------------------------------------------------------------- # Option to use PACKED BITS SUPPORT #----------------------------------------------------------------------------- OPTION (HDF5_USE_H5DUMP_PACKED_BITS "Use the PACKED BITS feature in h5dump" OFF) |