Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f935410386fd45b772a673019899ab4f5c8c4db9..11d16ceacc850a3a05fcdc7e5c105a9288601ca2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,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/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 998f6657fa1f125bcabe69dbd0f5f7c6af69ea02..689d92bfacd4beb54ef55962a2912415cacb8360 100644 (file)
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(
   ${SMESH_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/idl
 )
 
@@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -50,7 +50,7 @@ SET(_link_LIBRARIES
   ${GUI_suit}
   ${SMESH_SMESH}
   ${KERNEL_SALOMELocalTrace}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   SalomeIDLHEXABLOCKPLUGIN
 )
 

diff --git a/src/HEXABLOCKPlugin/CMakeLists.txt b/src/HEXABLOCKPlugin/CMakeLists.txt
index ec9a1661f4dbfc12c2feae68053a050f3b1ca014..175e7a9e58edbb41dcabc1ad34b252cbc16f28ef 100644 (file)
--- a/src/HEXABLOCKPlugin/CMakeLists.txt
+++ b/src/HEXABLOCKPlugin/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${HEXABLOCK_INCLUDE_DIRS}
@@ -34,18 +34,18 @@ 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}
+  TKBRep
+  TKG2d
+  TKG3d
+  TKTopAlgo
+  TKGeomBase
+  TKGeomAlgo
   ${HEXABLOCK_HEXABLOCKEngine}
   ${SMESH_SMESHimpl}
   ${SMESH_SMESHEngine}