Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2de201ea89382093db5f8a05d7ffd34215203fd7..02271ec3f8b3464a5cc52d876d77873fe7060374 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ IF(SALOME_BUILD_GUI)
   ENDIF()
 ENDIF(SALOME_BUILD_GUI)
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 # VTK
 FIND_PACKAGE(SalomeVTK REQUIRED)
 

diff --git a/src/GHS3DPlugin/CMakeLists.txt b/src/GHS3DPlugin/CMakeLists.txt
index 0747cb898d9170784788b7229a93010278bcbcfb..b93f1ed6b440d2f906ae184590223918f7cf0b57 100644 (file)
--- a/src/GHS3DPlugin/CMakeLists.txt
+++ b/src/GHS3DPlugin/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${GEOM_INCLUDE_DIRS}
   ${SMESH_INCLUDE_DIRS}
   ${VTK_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_LIBRARY}
   ${SMESH_SMESHimpl}
   ${SMESH_SMESHEngine}

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index fc83f9e8962652b22572077de77a6f43fbb812bb..eca32c33ba569ad54932f2e14f6837a498b1e96a 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}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${GEOM_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}
   SalomeIDLGHS3DPLUGIN
 )