Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a2fc52cbdbd3b21a8597a774b2ff1301d396949..6b9dd403a7cff3936d613b548d7d36cad5d2632b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ IF(SALOME_BUILD_GUI)
 ENDIF(SALOME_BUILD_GUI)
 
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 # VTK
 FIND_PACKAGE(SalomeVTK REQUIRED)
 

diff --git a/src/BLSURFPlugin/CMakeLists.txt b/src/BLSURFPlugin/CMakeLists.txt
index d6e1a186460543929ea96059b60bf0c9690e320d..f1d7ac7b11de7610ee3d835ceb0c82adfb59a82d 100644 (file)
--- a/src/BLSURFPlugin/CMakeLists.txt
+++ b/src/BLSURFPlugin/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${MESHGEMS_INCLUDE_DIRS}
   ${SMESH_INCLUDE_DIRS}
@@ -37,22 +37,16 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(  
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${PYTHON_LIBRARIES}
-  ${CAS_TKBRep}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKXCAF}
-  ${CAS_TKXSBase}
-  ${CAS_TKG2d}
-  ${CAS_TKG3d}
-  ${CAS_TKShHealing}
+  ${OpenCASCADE_ModelingData_LIBRARIES} 
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} 
+  ${OpenCASCADE_DataExchange_LIBRARIES}
   ${MESHGEMS_CADSURF_LIBRARY}
   ${SMESH_SMESHimpl}
   ${SMESH_SMESHEngine}

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 4a13b7de9825dcfffa411acd0be0297603486ed2..b5e26373f6812f0650acabd9df452be234b2d4c0 100644 (file)
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDES}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -62,7 +62,7 @@ SET(_link_LIBRARIES
   ${SMESH_PluginUtils}
   ${SMESH_StdMeshersGUI}
   ${SMESH_SMESHFiltersSelection}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${MESHGEMS_LIBRARIES}
   SalomeIDLBLSURFPLUGIN
   BLSURFEngine