Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae5c4f9f96d957fbd18cdcf17507def4d4bec0ca..cb4cc1269f12d2e7e384086ffbda4c10e7eb7623 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,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/HEXABLOCK/CMakeLists.txt b/src/HEXABLOCK/CMakeLists.txt
index 6bf4dc963a9f4d4c636fd46596ee950de14b938a..eb6586ae4245f6cde50281e7de73e0377e47fd1d 100644 (file)
--- a/src/HEXABLOCK/CMakeLists.txt
+++ b/src/HEXABLOCK/CMakeLists.txt
@@ -22,7 +22,7 @@
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
@@ -33,21 +33,21 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${KERNEL_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKBRep}
-  ${CAS_TKPrim}
-  ${CAS_TKG3d}
-  ${CAS_TKG2d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKBool}
-  ${CAS_TKBO}
+  TKBRep
+  TKPrim
+  TKG3d
+  TKG2d
+  TKTopAlgo
+  TKGeomBase
+  TKGeomAlgo
+  TKBool
+  TKBO
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SALOMEBasics}
   ${PYTHON_LIBRARIES}

diff --git a/src/HEXABLOCKGUI/CMakeLists.txt b/src/HEXABLOCKGUI/CMakeLists.txt
index 3dd8de2a293363c28144c39d9d9a97e3fd07954f..7521a4295b67308b9e442bfd910452f3f13647d0 100644 (file)
--- a/src/HEXABLOCKGUI/CMakeLists.txt
+++ b/src/HEXABLOCKGUI/CMakeLists.txt
@@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -47,7 +47,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${KERNEL_DEFINITIONS}
 )
 

diff --git a/src/HEXABLOCK_SWIG/CMakeLists.txt b/src/HEXABLOCK_SWIG/CMakeLists.txt
index 5541e9989f2908d9d179e266e03977ccfc4ca1fe..f6680e43d8a538662574e808a589eea681779d31 100644 (file)
--- a/src/HEXABLOCK_SWIG/CMakeLists.txt
+++ b/src/HEXABLOCK_SWIG/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${KERNEL_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -43,15 +43,8 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   ${PYTHON_LIBRARIES}
   ${GEOM_GEOMBase}
-  ${CAS_TKBRep}
-  ${CAS_TKPrim}
-  ${CAS_TKG3d}
-  ${CAS_TKG2d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKBool}
-  ${CAS_TKBO}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SALOMEBasics}
   HEXABLOCKEngine