From: rnc <rnc@opencascade.com>
Date: Fri, 11 Oct 2013 13:08:43 +0000 (+0000)
Subject: BUG: GEOM/CMake build procedure: VTK and OCCT are Geom specifics. They are not used... 
X-Git-Tag: BR_hydro_v_0_3_1~91
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=17497fdd95760216276eefb9bc4b69f09a7d8755;p=modules%2Fgeom.git

BUG: GEOM/CMake build procedure: VTK and OCCT are Geom specifics. They are not used by KERNEL. Putting them before GUI detection broke the detection from GUI configuration when GEOM is built with GUI.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88e54272f..20952ade8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,8 +87,6 @@ FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 FIND_PACKAGE(SalomeLibXml2 REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
-FIND_PACKAGE(SalomeCAS REQUIRED)
-FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
 
 # Other KERNEL optionals:
 IF(SALOME_USE_MPI)
@@ -123,6 +121,7 @@ ENDIF(SALOME_BUILD_GUI)
 ##
 ## Prerequisites From GUI:
 ##
+
 IF(SALOME_BUILD_GUI)
 
   # Qt4
@@ -139,6 +138,9 @@ ENDIF(SALOME_BUILD_GUI)
 ## GEOM specifics
 ##
 
+FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
+
 
 IF(SALOME_BUILD_GUI)
   # OpenCV