cmake - clean up a bit in non-advanced variables

Andrej730 · Andrej730 · commit 61269136cd03 · 2025-12-12T19:30:22.000+05:00
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -152,6 +152,7 @@ if(CCACHE_FOUND)
         endif()
     endif()
 endif()
+mark_as_advanced(CCACHE_FOUND)
 
 # Variable to accumulate swig definitions from various submodules.
 set(SWIG_DEFINES "")
@@ -239,6 +240,7 @@ if (WITH_ROCKSDB)
         set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
     endif()
     find_package(RocksDB CONFIG REQUIRED)
+    mark_as_advanced(RocksDB_DIR)
     if(WIN32)
         set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
     endif()
@@ -253,6 +255,7 @@ if (WITH_ROCKSDB)
         # the libzstd.a along with the rocksdb library when needed and feature
         # detect based on rocksdb API?
         find_package(zstd CONFIG REQUIRED)
+        mark_as_advanced(zstd_DIR)
         message(STATUS "zstd: found at '${zstd_DIR}'.")
         link_libraries(zstd::libzstd_static)
 
diff --git a/cmake/FindHDF5.cmake b/cmake/FindHDF5.cmake
@@ -86,6 +86,7 @@ endif()
 if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
     # First try to find it as a config.
     find_package(HDF5 CONFIG)
+    mark_as_advanced(HDF5_DIR)
     if(HDF5_DIR)
         message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
         set(HDF5_LIBRARIES hdf5_cpp-static)
diff --git a/cmake/FindOpenCASCADE.cmake b/cmake/FindOpenCASCADE.cmake
@@ -33,8 +33,10 @@ if(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
     # OpenCASCADE may be built with VTK support. Try to find VTK first to avoid
     # CMake errors when OpenCASCADE's config references VTK targets.
     find_package(VTK QUIET)
+    mark_as_advanced(VTK_DIR)
 
     find_package(OpenCASCADE CONFIG REQUIRED)
+    mark_as_advanced(OpenCASCADE_DIR)
     message(STATUS "Found OpenCASCADE config: ${OpenCASCADE_DIR}")
 
     if(OpenCASCADE_VERSION VERSION_LESS "7.9.0")
diff --git a/cmake/FindOpenCOLLADA.cmake b/cmake/FindOpenCOLLADA.cmake
@@ -21,6 +21,7 @@ if(NOT OPENCOLLADA_INCLUDE_DIR AND NOT OPENCOLLADA_LIBRARY_DIR)
     # If package is found, automatically sets
     # OPENCOLLADA_INCLUDE_DIRS and OPENCOLLADA_LIBRARIES (list of targets, not paths).
     find_package(OpenCOLLADA CONFIG)
+    mark_as_advanced(OpenCOLLADA_DIR)
     if(OpenCOLLADA_DIR)
         message(STATUS "Found OpenCOLLADA: '${OpenCOLLADA_DIR}'.")
         set(OPENCOLLADA_FOUND TRUE)
diff --git a/cmake/Findnlohmann_json.cmake b/cmake/Findnlohmann_json.cmake
@@ -11,12 +11,14 @@ UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
 
 if(NOT JSON_INCLUDE_DIR)
     find_package(nlohmann_json CONFIG)
+    mark_as_advanced(nlohmann_json)
     if(nlohmann_json_DIR)
         return()
     endif()
 endif()
 
 find_path(json_header_path "nlohmann/json.hpp" HINTS "${JSON_INCLUDE_DIR}")
+mark_as_advanced(json_header_path)
 
 if(json_header_path)
     message(STATUS "JSON for Modern C++ header file found in '${json_header_path}'.")
diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake
@@ -21,6 +21,7 @@
 macro(UNIFY_ENVVARS_AND_CACHE VAR)
     if(NOT DEFINED ${VAR} AND DEFINED ENV{${VAR}} AND NOT ENV{${VAR}} STREQUAL "")
         set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
+        mark_as_advanced(${VAR})
     endif()
 endmacro()
 
