Configuration - Re-Configuration time optimization #467

Refactor CMake files to hide redundant variables using mark_as_advanced.
The result - no re-find will be performed.
From 30s to 5s for second time reconfiguration stage.

diff --git a/adm/cmake/doxygen.cmake b/adm/cmake/doxygen.cmake
index 46ad1e2e15047965047adf94f8e42c55b98010ba..e37a548431ef5f1285769f9eb8f5d10adb64b864 100644 (file)
--- a/adm/cmake/doxygen.cmake
+++ b/adm/cmake/doxygen.cmake
@@ -56,7 +56,7 @@ else()
   endif()
 endif()
 
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
-OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
-OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)
+# hide all redundant variables
+mark_as_advanced (DOXYGEN_SKIP_DOT)
+mark_as_advanced (DOXYGEN_EXECUTABLE)
+mark_as_advanced (DOXYGEN_DOT_EXECUTABLE)

diff --git a/adm/cmake/eigen.cmake b/adm/cmake/eigen.cmake
index 87b56ea4641642ef43cce333abef725de3efa3af..3468dc9a928a30464276ef08f9f1eeda386200d5 100644 (file)
--- a/adm/cmake/eigen.cmake
+++ b/adm/cmake/eigen.cmake
@@ -83,5 +83,5 @@ else()
   set (3RDPARTY_EIGEN_INCLUDE_DIR "" CACHE PATH "the path to Eigen header file" FORCE)
 endif()
 
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET(Eigen3_DIR)
+# hide all redundant variables
+mark_as_advanced(Eigen3_DIR)

diff --git a/adm/cmake/ffmpeg.cmake b/adm/cmake/ffmpeg.cmake
index efd9a3f861332adcaaffb2a48ef11b5a7fe89e3e..6499a5e017dfaa8273387a0665ee9f091aac4315 100644 (file)
--- a/adm/cmake/ffmpeg.cmake
+++ b/adm/cmake/ffmpeg.cmake
@@ -247,7 +247,7 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
   mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
 endforeach()
 
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
-OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
-OCCT_CHECK_AND_UNSET (FFMPEG_DIR)
+# hide all redundant variables
+mark_as_advanced (FFMPEG_INCLUDE_DIRS)
+mark_as_advanced (FFMPEG_LIBRARY_DIRS)
+mark_as_advanced (FFMPEG_DIR)

diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake
index 010c5c268bcd96282c0900aadb592d2f870c038d..c51d37c7d449995b2d5c6f6a5a4fb201a71e1b3e 100644 (file)
--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -389,10 +389,10 @@ endif()
   endif()
 #endif()
 
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
-OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
-OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
+# hide all redundant variables
+mark_as_advanced(FREETYPE_INCLUDE_DIR_ft2build)
+mark_as_advanced(FREETYPE_INCLUDE_DIR_freetype2)
+mark_as_advanced(FREETYPE_LIBRARY_RELEASE)
 
 if (BUILD_SHARED_LIBS)
   mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)

diff --git a/adm/cmake/rapidjson.cmake b/adm/cmake/rapidjson.cmake
index 4a419d4d839b4cf952e5d6c114dd459b3b52f324..6b9816727d92788d3dfdf5951a112909db1d3650 100644 (file)
--- a/adm/cmake/rapidjson.cmake
+++ b/adm/cmake/rapidjson.cmake
@@ -90,5 +90,5 @@ else()
   set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
 endif()
 
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET(RapidJSON_DIR)
+# hide all redundant variables
+mark_as_advanced(RapidJSON_DIR)

diff --git a/adm/cmake/tcl.cmake b/adm/cmake/tcl.cmake
index 7e722b2109c6bb16387c6263a62493383769d608..ba3664f710366fb8ba23327a0cf4b58204d0fe70 100644 (file)
--- a/adm/cmake/tcl.cmake
+++ b/adm/cmake/tcl.cmake
@@ -273,13 +273,12 @@ if (TK_FOUND AND 3RDPARTY_TCL_DIR)
   endif()
 endif()
 
-# unset all redundant variables
-#TCL
-OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
-OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+# hide all redundant variables
+# TCL
+mark_as_advanced (TCL_LIBRARY)
+mark_as_advanced (TCL_INCLUDE_PATH)
+mark_as_advanced (TCL_TCLSH)
 #TK
-OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TK_WISH)
-
+mark_as_advanced (TK_LIBRARY)
+mark_as_advanced (TK_INCLUDE_PATH)
+mark_as_advanced (TK_WISH)

diff --git a/adm/cmake/tk.cmake b/adm/cmake/tk.cmake
index 753531f5fc473d2d4a1e8ca0c0f4542dc8c025bb..ec48b17f92fd50d6480b869db7841fc0f86568ba 100644 (file)
--- a/adm/cmake/tk.cmake
+++ b/adm/cmake/tk.cmake
@@ -274,15 +274,15 @@ if (BUILD_SHARED_LIBS)
   mark_as_advanced (3RDPARTY_TK_LIBRARY 3RDPARTY_TK_DLL)
 endif()
 
-# unset all redundant variables
-#TCL
-OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
-OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+# hide all redundant variables
+
+mark_as_advanced (TCL_LIBRARY)
+mark_as_advanced (TCL_INCLUDE_PATH)
+mark_as_advanced (TCL_TCLSH)
 #TK
-OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TK_WISH)
+mark_as_advanced (TK_LIBRARY)
+mark_as_advanced (TK_INCLUDE_PATH)
+mark_as_advanced (TK_WISH)
 
 if (NOT BUILD_SHARED_LIBS)
   OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY)

diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
index eabc62d3f75bd177b121fe0f9efdc9a030037c0d..a563febb637fbb7fe957725efd502d79448fff4f 100644 (file)
--- a/adm/cmake/vtk.cmake
+++ b/adm/cmake/vtk.cmake
@@ -341,6 +341,7 @@ if (NOT INSTALL_VTK)
   endif()
 endif()
 
-OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
-OCCT_CHECK_AND_UNSET (VTK_LIBRARY_DIRS)
-OCCT_CHECK_AND_UNSET (VTK_DIR)
+# hide some variables
+mark_as_advanced (VTK_INCLUDE_DIRS)
+mark_as_advanced (VTK_LIBRARY_DIRS)
+mark_as_advanced (VTK_DIR)