ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 02:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
rnc 2013-10-11 13:08:43 +00:00
parent 959c2db5b3
commit 17497fdd95
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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