X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=adm%2Fcmake%2Focct_macros.cmake;h=0a38794527ef0d66421504f07482bdf015c7bbba;hb=620a6baa59c9d51ed735c3c9356f12b09f043b44;hpb=89073268fd1a1a70de23deaa02af49453c497066

diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index 8220ecd5d3..0a38794527 100644
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -12,18 +12,12 @@ macro (OCCT_CHECK_AND_UNSET VARNAME)
   endif()
 endmacro()
 
-macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
-
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
-
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
-
-  if (WIN32)
-    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
-    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
-  endif()
+macro (OCCT_CHECK_AND_UNSET_GROUP GROUPNAME)
+  get_cmake_property(VARS VARIABLES)
+  string (REGEX MATCHALL "(^|;)${GROUPNAME}[A-Za-z0-9_]*" GROUPNAME_VARS "${VARS}")
+  foreach(GROUPNAME_VAR ${GROUPNAME_VARS})
+    OCCT_CHECK_AND_UNSET(${GROUPNAME_VAR})
+  endforeach()
 endmacro()
 
 macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)