diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-10 21:14:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-10 21:14:21 (GMT) |
| commit | ec76ca98c1a11b4943d39ff392d214c61eebc7cb (patch) | |
| tree | 198f56354830b785c651148f07161dabbabcc694 /CMakeLists.txt | |
| parent | ada604b46f81b75881d762cab4da6d00326f6d06 (diff) | |
| download | hdf5-ec76ca98c1a11b4943d39ff392d214c61eebc7cb.zip hdf5-ec76ca98c1a11b4943d39ff392d214c61eebc7cb.tar.gz hdf5-ec76ca98c1a11b4943d39ff392d214c61eebc7cb.tar.bz2 | |
[svn-r21217] Change CTEST_NAME to HDF5 - the project name
Implement InitOnceExecuteOnce - HDFFV-5929
Change command to generate output source files
Tested: local linux, windows
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aedef8..ac3acd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,7 +371,11 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) # Compiler specific flags : Shouldn't there be compiler tests for these #----------------------------------------------------------------------------- IF (CMAKE_COMPILER_IS_GNUCC) + IF (CMAKE_BUILD_TYPE MATCHES Debug) + SET (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -finline-functions -fno-common") + ELSE (CMAKE_BUILD_TYPE MATCHES Debug) SET (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -fomit-frame-pointer -finline-functions -fno-common") + ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) ENDIF (CMAKE_COMPILER_IS_GNUCC) #----------------------------------------------------------------------------- @@ -593,6 +597,11 @@ IF (WIN32 AND NOT CYGWIN) IF (H5_HAVE_IOEO) MESSAGE (STATUS " **** Windows Threads only available in WINVER>=0x600 (Vista or Windows 7)**** ") SET (H5_HAVE_WIN_THREADS 1) + ELSE (H5_HAVE_IOEO) + IF (NOT H5_HAVE_PTHREAD_H) + SET (H5_HAVE_THREADSAFE 0) + MESSAGE (FATAL " **** Threadsafe option requires thread library **** ") + ENDIF (NOT H5_HAVE_PTHREAD_H) ENDIF (H5_HAVE_IOEO) ENDIF (HDF5_ENABLE_THREADSAFE) ENDIF (WIN32 AND NOT CYGWIN) @@ -844,7 +853,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) IF (HDF5_ENABLE_PARALLEL) SET (release_files ${release_files} - ${HDF5_SOURCE_DIR}/release_docs/INSTALL_parallel.txt + ${HDF5_SOURCE_DIR}/release_docs/INSTALL_parallel ) ENDIF (HDF5_ENABLE_PARALLEL) INSTALL ( |