Merge pull request #4671 from thewtex/cmake-advanced-mac

cmake advanced mac

Author: thewtex

CMake/ITKModuleRemote.cmake

@@ -199,17 +199,16 @@ function(itk_fetch_module _name _description)
 
   if(NOT DEFINED Module_${_name})
     option(Module_${_name} "(Remote-${MODULE_COMPLIANCE_LEVEL}) ${_description}" OFF)
+    mark_as_advanced(Module_${_name})
   else()
     # If Module_${_name} is set manually, put its value in the CACHE
     option(Module_${_name} "(Remote-${MODULE_COMPLIANCE_LEVEL}) ${_description}" ${Module_${_name}})
   endif()
 
   if(${MODULE_COMPLIANCE_LEVEL} GREATER_EQUAL ${ITK_MINIMUM_COMPLIANCE_LEVEL})
     set(Module_${_name}_VALID ON)
-    mark_as_advanced(CLEAR Module_${_name})
   else()
     set(Module_${_name}_VALID OFF)
-    mark_as_advanced(FORCE Module_${_name})
   endif()
   # message(INFO " MODULE_VALID Module_${_name}:${Module_${_name}_VALID}:${MODULE_COMPLIANCE_LEVEL}>=${ITK_MINIMUM_COMPLIANCE_LEVEL}")
 

Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt

@@ -8,7 +8,7 @@ if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
 else()
   set(GDCM_CMAKE_POLICY_VERSION "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
 endif()
-cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION}) 
+cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION})
 
 # GDCM version 3.0.0 will only support C++11 and greater
 if(CMAKE_CXX_STANDARD EQUAL "98" )
@@ -23,7 +23,7 @@ project(GDCM
 ## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0
 set(PROJECT_DESCRIPTION "GDCM - Grassroots DICOM. GDCM is yet another DICOM library.")
 
-## Set aliases for backwards compatibility.  GDCM_VERSION_XXX are configured by the project() command 
+## Set aliases for backwards compatibility.  GDCM_VERSION_XXX are configured by the project() command
 set(GDCM_MAJOR_VERSION ${GDCM_VERSION_MAJOR})
 set(GDCM_MINOR_VERSION ${GDCM_VERSION_MINOR})
 set(GDCM_BUILD_VERSION ${GDCM_VERSION_PATCH})
@@ -564,7 +564,10 @@ if(APPLE)
   if(GDCM_USE_COREFOUNDATION_LIBRARY)
     find_library(COREFOUNDATION_LIBRARY CoreFoundation )
   endif()
-  mark_as_advanced(COREFOUNDATION_LIBRARY)
+  mark_as_advanced(
+    GDCM_USE_COREFOUNDATION_LIBRARY
+    COREFOUNDATION_LIBRARY
+    )
 endif()
 
 #-----------------------------------------------------------------------------

Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt

@@ -168,6 +168,7 @@ endif()
 if (APPLE)
 	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+	mark_as_advanced(OPJ_USE_DSYMUTIL)
 endif()
 
 #-----------------------------------------------------------------------------