File tree Expand file tree Collapse file tree 3 files changed +15
-9
lines changed Expand file tree Collapse file tree 3 files changed +15
-9
lines changed Original file line number Diff line number Diff line change @@ -472,15 +472,6 @@ macro (HDF_DIR_PATHS package_prefix)
472
472
set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} )
473
473
endif ()
474
474
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
-
484
475
SET_HDF_BUILD_TYPE ()
485
476
486
477
SET_HDF_OUTPUT_DIRS (${package_prefix} )
Original file line number Diff line number Diff line change @@ -40,6 +40,15 @@ set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE)
40
40
41
41
set (HDF5_MINGW_STATIC_GCC_LIBS ON CACHE BOOL "Statically link libgcc/libstdc++" FORCE )
42
42
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
+
43
52
set (HDF5_ALLOW_EXTERNAL_SUPPORT "TGZ" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE )
44
53
set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ )
45
54
Original file line number Diff line number Diff line change @@ -796,6 +796,12 @@ Bug Fixes since HDF5-2.0.0 release
796
796
797
797
Configuration
798
798
-------------
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
+
799
805
- The relative rpaths ($ORIGIN / @loader_path) are appended to the CMAKE_INSTALL_RPATH
800
806
801
807
The RPATH settings were removed by a pull-request #5271, but the settings are needed
You can’t perform that action at this time.
0 commit comments