Skip to content

Commit eb7f7da

Browse files
committed
Mark several CMake variables as advanced
1 parent 9dbc54d commit eb7f7da

23 files changed

+72
-14
lines changed

CMakeBuildOptions.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ option (HDF5_ENABLE_PREADWRITE "Use pread/pwrite in sec2/log/core VFDs in place
3636
mark_as_advanced (HDF5_ENABLE_PREADWRITE)
3737

3838
option (HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols" ON)
39+
mark_as_advanced (HDF5_ENABLE_DEPRECATED_SYMBOLS)
3940

4041
option (HDF5_MINGW_STATIC_GCC_LIBS "Statically link libgcc/libstdc++" OFF)
4142
mark_as_advanced (HDF5_MINGW_STATIC_GCC_LIBS)
@@ -71,6 +72,7 @@ mark_as_advanced (HDF5_BUILD_PARALLEL_TOOLS)
7172
option (HDF5_BUILD_TOOLS "Build HDF5 Tools" ON)
7273

7374
option (HDF5_ENABLE_PLUGIN_SUPPORT "Enable PLUGIN Filters" OFF)
75+
mark_as_advanced (HDF5_ENABLE_PLUGIN_SUPPORT)
7476

7577
option (HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" ON)
7678

CMakeInstallation.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ include (CMakePackageConfigHelpers)
4040
if (WIN32)
4141
set (PF_ENV_EXT "(x86)")
4242
find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles${PF_ENV_EXT}}\\NSIS")
43+
mark_as_advanced (NSIS_EXECUTABLE)
4344
if(NOT CPACK_WIX_ROOT)
4445
file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT)
4546
endif ()
4647
find_program (WIX_EXECUTABLE candle PATHS "${CPACK_WIX_ROOT}/bin")
48+
mark_as_advanced (WIX_EXECUTABLE)
4749
endif ()
4850

4951

@@ -206,6 +208,7 @@ install (
206208
# Configure the HDF5_Examples.cmake file and the examples
207209
#-----------------------------------------------------------------------------
208210
option (HDF5_PACK_EXAMPLES "Package the HDF5 Library Examples Compressed File" OFF)
211+
mark_as_advanced (HDF5_PACK_EXAMPLES)
209212
if (HDF5_PACK_EXAMPLES)
210213
if (DEFINED CMAKE_TOOLCHAIN_FILE)
211214
get_filename_component(TOOLCHAIN ${CMAKE_TOOLCHAIN_FILE} NAME)
@@ -476,13 +479,15 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
476479
set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
477480

478481
find_program (DPKGSHLIB_EXE dpkg-shlibdeps)
482+
mark_as_advanced (DPKGSHLIB_EXE)
479483
if (DPKGSHLIB_EXE)
480484
list (APPEND CPACK_GENERATOR "DEB")
481485
set (CPACK_DEBIAN_PACKAGE_SECTION "Libraries")
482486
set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${HDF5_PACKAGE_BUGREPORT}")
483487
endif ()
484488

485489
find_program (RPMBUILD_EXE rpmbuild)
490+
mark_as_advanced (RPMBUILD_EXE)
486491
if (RPMBUILD_EXE AND NOT HDF5_ENABLE_PARALLEL)
487492
list (APPEND CPACK_GENERATOR "RPM")
488493
set (CPACK_RPM_PACKAGE_RELEASE "1")

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,7 @@ else ()
11011101
set (_HDF5_H5CC_C_COMPILER ${CMAKE_C_COMPILER})
11021102
endif ()
11031103
set (HDF5_H5CC_C_COMPILER ${_HDF5_H5CC_C_COMPILER} CACHE STRING "C compiler to use in h5cc")
1104+
mark_as_advanced (HDF5_H5CC_C_COMPILER)
11041105

11051106
#-----------------------------------------------------------------------------
11061107
# Java implementation detection for version value
@@ -1471,3 +1472,9 @@ list (REMOVE_DUPLICATES LINK_LIBS_SETTINGS)
14711472
# Installation
14721473
#-----------------------------------------------------------------------------
14731474
include (CMakeInstallation.cmake)
1475+
1476+
#-----------------------------------------------------------------------------
1477+
# Hide some miscellaneous CMake variables from the default GUI
1478+
#-----------------------------------------------------------------------------
1479+
mark_as_advanced (FETCHCONTENT_BASE_DIR FETCHCONTENT_FULLY_DISCONNECTED FETCHCONTENT_QUIET FETCHCONTENT_UPDATES_DISCONNECTED)
1480+

CMakeTests.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
mark_as_advanced (HDF5_TEST_SERIAL)
107107

108108
cmake_dependent_option (HDF5_TEST_TOOLS "Execute tools tests" ON "HDF5_BUILD_TOOLS" OFF)
109+
mark_as_advanced (HDF5_TEST_TOOLS)
109110

110111
cmake_dependent_option (HDF5_TEST_EXAMPLES "Execute tests on examples" ON "HDF5_BUILD_EXAMPLES" OFF)
111112
mark_as_advanced (HDF5_TEST_EXAMPLES)

CTestConfig.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ set (CTEST_TEST_TIMEOUT 1200 CACHE STRING
3939
"Maximum time allowed before CTest will kill the test.")
4040
set (DART_TESTING_TIMEOUT 1200 CACHE STRING
4141
"Maximum time allowed before CTest will kill the test." FORCE)
42+
mark_as_advanced (CTEST_TEST_TIMEOUT)
43+
mark_as_advanced (DART_TESTING_TIMEOUT)
4244

4345
set (CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING
4446
"How long to wait between timed-out CTest submissions.")

HDF5Examples/C/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ add_subdirectory (${PROJECT_SOURCE_DIR}/H5T)
1111

1212
if (${H5_LIBVER_DIR} GREATER 16)
1313
# add_subdirectory (${PROJECT_SOURCE_DIR}/Perf)
14-
if (USE_SHARED_LIBS AND H5EXAMPLE_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT)
14+
if (H5EXAMPLE_USE_SHARED_LIBS AND H5EXAMPLE_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT)
1515
add_subdirectory (${PROJECT_SOURCE_DIR}/H5FLT)
1616
endif ()
1717
endif ()

HDF5Examples/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if (NOT EXAMPLES_EXTERNALLY_CONFIGURED)
2626
include (TestBigEndian)
2727
if (NOT WINDOWS)
2828
TEST_BIG_ENDIAN (H5EXAMPLE_WORDS_BIGENDIAN)
29+
mark_as_advanced (H5EXAMPLE_WORDS_BIGENDIAN)
2930
endif ()
3031

3132
include (${H5EXAMPLE_CONFIG_DIR}/HDFMacros.cmake)
@@ -65,6 +66,7 @@ endif ()
6566
#-----------------------------------------------------------------------------
6667
if(NOT DEFINED _h5public_h_contents)
6768
find_file (_h5public_h H5public.h ${H5EXAMPLE_HDF5_INCLUDE_DIRS})
69+
mark_as_advanced (H5EXAMPLE_HDF5_INCLUDE_DIRS)
6870
file (READ ${_h5public_h} _h5public_h_contents)
6971

7072
string (REGEX REPLACE ".*#define[ \t]+H5_VERS_MAJOR[ \t]+([0-9]*).*$"

HDF5Examples/CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"inherits": ["ci-base", "ci-base-examples"],
4949
"cacheVariables": {
5050
"BUILD_SHARED_LIBS": "ON",
51-
"USE_SHARED_LIBS": "ON"
51+
"H5EXAMPLE_USE_SHARED_LIBS": "ON"
5252
}
5353
},
5454
{

HDF5Examples/Using_CMake.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ III. Defaults in the CMakePresets.json file
253253
#### "binaryDir": "${sourceParentDir}/build/${presetName}"
254254
#### "name": "ci-StdShar"
255255
#### "BUILD_SHARED_LIBS": "ON",
256-
#### "USE_SHARED_LIBS": "ON"
256+
#### "H5EXAMPLE_USE_SHARED_LIBS": "ON"
257257
#### "CMAKE_BUILD_TYPE": "RelWithDebInfo"
258258
#### "H5EXAMPLE_BUILD_FORTRAN": "ON"
259259
#### "H5EXAMPLE_BUILD_CXX": "ON"

HDF5Examples/config/HDFMacros.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ endmacro ()
9191

9292
macro (HDF_DIR_PATHS package_prefix)
9393
option (H5EXAMPLE_USE_GNU_DIRS "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" OFF)
94+
mark_as_advanced (H5EXAMPLE_USE_GNU_DIRS)
9495
if (H5EXAMPLE_USE_GNU_DIRS)
9596
include(GNUInstallDirs)
9697
if (NOT ${package_prefix}_INSTALL_BIN_DIR)

0 commit comments

Comments
 (0)