diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
| commit | adb2fd1cc0858602046959689377dbdb60a4c3a6 (patch) | |
| tree | 3d2ea72ca7ba9c2502d9c2230d261acd9fe7c95d /src/CMakeLists.txt | |
| parent | 9f69967286c1014355421b02db986303de1cfcda (diff) | |
| parent | ebc0b44fe18a40b7f31bdde45ec9f16edd4f658a (diff) | |
| download | hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.zip hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.gz hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.bz2 | |
[svn-r24208] Merge revisions through r24202 from trunk to vol branch
Tested: jam, koala, ostrich, platypus (h5committest)
There are failures on platypus (cmake) that were present previously
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc33aee..743a706 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -788,13 +788,8 @@ INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}) # Setup the H5Detect utility which generates H5Tinit with platform # specific type checks inside #----------------------------------------------------------------------------- -IF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - SET (LOCAL_OPT_FLAG "-O0") -ELSE (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - SET (LOCAL_OPT_FLAG " ") -ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c) -TARGET_C_PROPERTIES (H5detect ${LOCAL_OPT_FLAG} " ") +TARGET_C_PROPERTIES (H5detect " " " ") IF (MSVC) TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib") ENDIF (MSVC) |