summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-11-24 19:29:21 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-11-24 19:29:21 (GMT)
commit8de50ab66403798e15293368b2cb03c8f420c88f (patch)
treede3aa927285ea5e82c7b8b90e7560cbe8b2f6ea2
parente3c415fe5a345a6a42001b60c1b0e0f4a2ff9ed3 (diff)
downloadhdf5-8de50ab66403798e15293368b2cb03c8f420c88f.zip
hdf5-8de50ab66403798e15293368b2cb03c8f420c88f.tar.gz
hdf5-8de50ab66403798e15293368b2cb03c8f420c88f.tar.bz2
[svn-r28463] Merge of -r28460 from revise_chunks. Removes -std=c99 from
C++ flags under CMake. Tested on: Ubuntu 15.10 (x86_64 Linux 4.2.0) gcc 5.2.1, CMake 3.3.2
-rw-r--r--config/cmake/HDFCompilerFlags.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index c637c73..665db32 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -16,12 +16,12 @@ if (CMAKE_COMPILER_IS_GNUCC)
endif (CMAKE_COMPILER_IS_GNUCC)
if (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_BUILD_TYPE MATCHES Debug)
- set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS} -std=c99")
+ set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ftrapv -fno-common")
endif ()
else (CMAKE_BUILD_TYPE MATCHES Debug)
- set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS} -std=c99")
+ set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstdarg-opt")
endif ()