Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84c3519c924c6041748d4cc95eacb3ed1d9ef8d7..4ff36916ea0ebd3ee06568430096e4106fb9376a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,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 fa2db470e9889bb8184486c0765b23e550dcd652..4baf20a60a5014a3bc076e9e15df2c72f0f11230 100644 (file)
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE(UseQtExt)
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${NETGEN_INCLUDE_DIRS}
   ${QT_INCLUDES}
   ${PYTHON_INCLUDES}
@@ -40,7 +40,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -54,7 +54,7 @@ SET(_link_LIBRARIES
   ${GUI_LightApp}
   ${SMESH_SMESH}
   ${SMESH_PluginUtils}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   SalomeIDLNETGENPLUGIN
   NETGENEngine
 )

diff --git a/src/NETGENPlugin/CMakeLists.txt b/src/NETGENPlugin/CMakeLists.txt
index 5a5b0787231d1ef6f436478213ba4e6057d5d383..bce1220e1b5d4bcf0c819d0b05f54f212f1a87e9 100644 (file)
--- a/src/NETGENPlugin/CMakeLists.txt
+++ b/src/NETGENPlugin/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${NETGEN_INCLUDE_DIRS}
   ${SMESH_INCLUDE_DIRS}
@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(  
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${NETGEN_DEFINITIONS}
 )
@@ -43,34 +43,12 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${NETGEN_LIBRARIES}
-  ${CAS_TKernel}
-  ${CAS_TKBRep}
-  ${CAS_TKShHealing}
-  ${CAS_TKSTEP}
-  ${CAS_TKXSBase}
-  ${CAS_TKIGES}
-  ${CAS_TKMesh}
-  ${CAS_TKSTL}
-  ${CAS_TKG3d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKG2d}
-  ${CAS_TKBool}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKOffset}
-  ${CAS_TKGeomBase}
-  ${CAS_TKBO}
-  ${CAS_TKMath}
-  ${CAS_TKFillet}
-  ${CAS_TKMeshVS}
-  ${CAS_TKPrim}
-  ${CAS_TKSTEPBase}
-  ${CAS_TKSTEPAttr}
-  ${CAS_TKSTEP209}
-  ${CAS_TKXDESTEP}
-  ${CAS_TKXDEIGES}
-  ${CAS_TKXCAF}
-  ${CAS_TKLCAF}
-  ${CAS_FWOSPlugin}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+  ${OpenCASCADE_DataExchange_LIBRARIES}
+  ${OpenCASCADE_Visualization_LIBRARIES}
+  ${OpenCASCADE_ApplicationFramework_LIBRARIES}
   ${GEOM_GEOMbasic}
   ${SMESH_SMESHimpl}
   ${SMESH_SMESHEngine}