]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
OpenCascade is obligatory third-party product for the GUI module.
authorrnv <rnv@opencascade.com>
Thu, 19 Sep 2013 09:40:34 +0000 (09:40 +0000)
committerrnv <rnv@opencascade.com>
Thu, 19 Sep 2013 09:40:34 +0000 (09:40 +0000)
CMakeLists.txt

index 05423e4c9d548a6b16910976c905e28d81cd9538..21e2e9c5fa2fe4d1866cad0974a5b3216ee6faf0 100755 (executable)
@@ -120,17 +120,16 @@ FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt4
 # Build with GUI observers feature
 ADD_DEFINITIONS(-DWITH_SALOMEDS_OBSERVER)
 
+#OCCT
+FIND_PACKAGE(SalomeCAS REQUIRED)
+
 # Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL)
 INCLUDE(${QT_USE_FILE})
 
-FIND_PACKAGE(SalomePyQt4 REQUIRED) 
+FIND_PACKAGE(SalomePyQt4 REQUIRED)
 
 # Optional prerequisites for GUI
-IF(SALOME_USE_OCCVIEWER)
-  FIND_PACKAGE(SalomeCAS)
-  SALOME_LOG_OPTIONAL_PACKAGE(CAS SALOME_USE_OCCVIEWER)
-ENDIF()
 IF(SALOME_USE_GLVIEWER)
   FIND_PACKAGE(SalomeOpenGL)
   SALOME_LOG_OPTIONAL_PACKAGE(OpenGL SALOME_USE_GLVIEWER)