summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-08-26 15:35:15 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-08-26 15:35:15 (GMT)
commit8194f34ef79a58dc5e57b374873be4e50ad7ad7b (patch)
tree876b1d75477a2babe7fd8a7ef555611825e52526 /src
parenta17e786cd732ca3af91ebb473a0bd116f391c94a (diff)
downloadhdf5-8194f34ef79a58dc5e57b374873be4e50ad7ad7b.zip
hdf5-8194f34ef79a58dc5e57b374873be4e50ad7ad7b.tar.gz
hdf5-8194f34ef79a58dc5e57b374873be4e50ad7ad7b.tar.bz2
[svn-r24072] Merge trunk cmake changes to 1.8 branch.
Also add default switch blocks to h5import. Merge h5dump any_path option from trunk. Tested: local linux
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64d5e87..7439977 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -613,8 +613,13 @@ 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 " " " ")
+TARGET_C_PROPERTIES (H5detect ${LOCAL_OPT_FLAG} " ")
IF (MSVC)
TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
ENDIF (MSVC)