From: bruneton <bruneton>
Date: Wed, 29 Jan 2014 14:58:36 +0000 (+0000)
Subject: CMake: minor: enhancing FILE(GLOB ...) expression matching the sub directory
X-Git-Tag: V7_4_0a1~3^2~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ee62486b7f46b52304c863c53698349dade5d824;p=modules%2Fkernel.git

CMake: minor: enhancing FILE(GLOB ...) expression matching the sub directory
lib/cmake/paraview-x.y
---

diff --git a/salome_adm/cmake_files/FindSalomeVTK.cmake b/salome_adm/cmake_files/FindSalomeVTK.cmake
index 3733186ed..5da0b9638 100644
--- a/salome_adm/cmake_files/FindSalomeVTK.cmake
+++ b/salome_adm/cmake_files/FindSalomeVTK.cmake
@@ -50,7 +50,7 @@ IF(EXISTS "${PARAVIEW_ROOT_DIR}" AND (NOT VTK_ROOT_DIR))
   MESSAGE(STATUS "Looking for VTK in the ParaView installation (PARAVIEW_ROOT_DIR exists and VTK_ROOT_DIR is not defined) ...")
   
   # Extract sub-directory "paraview-x.xx":
-  FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-*")
+  FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-[1-9].[0-9]")
   MESSAGE(STATUS "Setting VTK_DIR to: ${VTK_DIR}") 
 ENDIF()