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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cb01cd4..ce0aadf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -409,7 +409,7 @@ include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake) include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake) include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake) -SET_HDF5_BUILD_TYPE() +SET_HDF_BUILD_TYPE() #----------------------------------------------------------------------------- # Setup output Directories @@ -553,11 +553,9 @@ endif () set (EXE_EXT "") if (WIN32) set (EXE_EXT ".exe") - if (NOT CYGWIN) - add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1) - add_definitions (-D_CRT_SECURE_NO_WARNINGS) - add_definitions (-D_CONSOLE) - endif () + add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1) + add_definitions (-D_CRT_SECURE_NO_WARNINGS) + add_definitions (-D_CONSOLE) endif () if (MSVC) @@ -584,7 +582,7 @@ option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF) #----------------------------------------------------------------------------- option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF) mark_as_advanced (HDF5_ENABLE_TRACE) -if (CMAKE_BUILD_TYPE MATCHES Debug) +if (${HDF_CFG_NAME} MATCHES "Debug") add_definitions (-DDEBUG) # Enable tracing of the API if (HDF5_ENABLE_TRACE) |