Skip to content

Commit b89f178

Browse files
authored
Remove default setting of CMAKE_DEBUG_POSTFIX (#5600)
1 parent 51dd775 commit b89f178

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

config/HDFMacros.cmake

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,15 +472,6 @@ macro (HDF_DIR_PATHS package_prefix)
472472
set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})
473473
endif ()
474474

475-
#set the default debug suffix for all library targets
476-
if(NOT CMAKE_DEBUG_POSTFIX)
477-
if (WIN32)
478-
set (CMAKE_DEBUG_POSTFIX "_D")
479-
else ()
480-
set (CMAKE_DEBUG_POSTFIX "_debug")
481-
endif ()
482-
endif ()
483-
484475
SET_HDF_BUILD_TYPE()
485476

486477
SET_HDF_OUTPUT_DIRS(${package_prefix})

config/cmake/cacheinit.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE)
4040

4141
set (HDF5_MINGW_STATIC_GCC_LIBS ON CACHE BOOL "Statically link libgcc/libstdc++" FORCE)
4242

43+
#set the default debug suffix for all library targets
44+
if (NOT CMAKE_DEBUG_POSTFIX)
45+
if (WIN32)
46+
set (CMAKE_DEBUG_POSTFIX "_D")
47+
else ()
48+
set (CMAKE_DEBUG_POSTFIX "_debug")
49+
endif ()
50+
endif ()
51+
4352
set (HDF5_ALLOW_EXTERNAL_SUPPORT "TGZ" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
4453
set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
4554

release_docs/RELEASE.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,12 @@ Bug Fixes since HDF5-2.0.0 release
796796

797797
Configuration
798798
-------------
799+
- Remove default setting of CMAKE_DEBUG_POSTFIX
800+
801+
Move the default setting of CMAKE_DEBUG_POSTFIX to the cacheinit.cmake file
802+
usually used by testing. If CMAKE_DEBUG_POSTFIX is not set with a -D option
803+
then CMAKE_DEBUG_POSTFIX will be the default provided by CMake itself.
804+
799805
- The relative rpaths ($ORIGIN / @loader_path) are appended to the CMAKE_INSTALL_RPATH
800806

801807
The RPATH settings were removed by a pull-request #5271, but the settings are needed

0 commit comments

Comments
 (0)