diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-19 20:07:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-19 20:07:10 (GMT) |
| commit | c5e311897444abe43b9dafcf0225e9fb880a3e2b (patch) | |
| tree | 559268d7f5da223f6bdae3c3e953d6eef18dcb07 /config/cmake | |
| parent | a2fbe6c7d835bb88645940c3f6191669d2df75eb (diff) | |
| parent | 608a71200d4f70708c141790ec33f88e2e1a9993 (diff) | |
| download | hdf5-c5e311897444abe43b9dafcf0225e9fb880a3e2b.zip hdf5-c5e311897444abe43b9dafcf0225e9fb880a3e2b.tar.gz hdf5-c5e311897444abe43b9dafcf0225e9fb880a3e2b.tar.bz2 | |
Merge pull request #863 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '608a71200d4f70708c141790ec33f88e2e1a9993':
HDFFV-10385 rename vars and macros
HDFFV-10385 Refactor out CMAKE_BUILD_TYPE usage
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 72d320c..a414cea 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -13,7 +13,7 @@ # Compiler specific flags : Shouldn't there be compiler tests for these #----------------------------------------------------------------------------- if (CMAKE_COMPILER_IS_GNUCC) - if (CMAKE_BUILD_TYPE MATCHES Debug) + if (${HDF_CFG_NAME} MATCHES "Debug") set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99") if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -ftrapv -fno-common") @@ -26,7 +26,7 @@ if (CMAKE_COMPILER_IS_GNUCC) endif () endif () if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED) - if (CMAKE_BUILD_TYPE MATCHES Debug) + if (${HDF_CFG_NAME} MATCHES "Debug") 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") |