Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e7d3ae70bc0edc954502d27e1ad61c5fc8b2542..226fde11238d7413ce3eb6fb3091aa859e876023 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ ENDIF(SALOME_BUILD_GUI)
 # VTK
 FIND_PACKAGE(SalomeVTK REQUIRED)
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 
 # Find GEOM
 # ===========

diff --git a/src/GHS3DPRLPlugin/CMakeLists.txt b/src/GHS3DPRLPlugin/CMakeLists.txt
index a4a5e333ae7413bbf9e7905a561f5057688a8e9a..4a7208a85639e08f8e165adf6925761ee5e13bc1 100644 (file)
--- a/src/GHS3DPRLPlugin/CMakeLists.txt
+++ b/src/GHS3DPRLPlugin/CMakeLists.txt
@@ -22,7 +22,7 @@
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${MESHGEMS_INCLUDE_DIRS}
   ${SMESH_INCLUDE_DIRS}
@@ -34,19 +34,19 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKBRep}
-  ${CAS_TKG2d}
-  ${CAS_TKG3d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKCDF}
+  TKBRep
+  TKG2d
+  TKG3d
+  TKTopAlgo
+  TKGeomBase
+  TKGeomAlgo
+  TKCDF
   ${MESHGEMS_TETRA_HPC_LIBRARY}
   ${SMESH_SMESHimpl}
   ${SMESH_SMESHEngine}

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index cdd0250f4369eb1c0d2ff3d07b29e7ea939dcf74..38776fefb6b5b6b56bc88812b798c51c2311a52a 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_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -55,7 +55,7 @@ SET(_link_LIBRARIES
   ${GUI_suit}
   ${GUI_qtx}
   ${GUI_SalomeApp}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   SalomeIDLGHS3DPRLPLUGIN
 )