Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2d069f668e871e1e1e6c96ed20d1a258cff1e40..045fb762e2e6bc8d25e337065c4e875e29294a45 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,7 +186,7 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR})
 # VTK is obligatiry for the SMESH
 FIND_PACKAGE(SalomeVTK REQUIRED)
 
-FIND_PACKAGE(SalomeCAS REQUIRED) 
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) 
 
 IF(SALOME_SMESH_USE_CGNS)
   FIND_PACKAGE(SalomeCGNS)

diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt
index 74798ca6756f6c46972d8d757574266402d14798..8f48ab1f2db96b41649d928b92657f786378e686 100644 (file)
--- a/src/Controls/CMakeLists.txt
+++ b/src/Controls/CMakeLists.txt
@@ -20,7 +20,7 @@
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
@@ -31,19 +31,16 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${VTK_LIBRARIES}
-  ${CAS_TKernel}
-  ${CAS_TKBRep}
-  ${CAS_TKG3d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   SMDS
   SMESHDS
   SMESHUtils

diff --git a/src/Driver/CMakeLists.txt b/src/Driver/CMakeLists.txt
index 96fb9645fedb0f1c8408fa63d69eea5580cdf4b5..40d69423cd3aee45a9aa47d5d17c899893ae9bb0 100644 (file)
--- a/src/Driver/CMakeLists.txt
+++ b/src/Driver/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${Boost_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/SMESHUtils
   ${PROJECT_SOURCE_DIR}/src/SMESHDS
@@ -29,15 +29,15 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${KERNEL_OpUtil}
-  ${CAS_TKernel}
-  ${CAS_TKTopAlgo}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   SMESHDS
   SMESHUtils
 )

diff --git a/src/DriverCGNS/CMakeLists.txt b/src/DriverCGNS/CMakeLists.txt
index 4ff5c99773f78069e680dbd7eacc1c413122a74a..0cf686fb333e91585505833491c210acd4ef4a73 100644 (file)
--- a/src/DriverCGNS/CMakeLists.txt
+++ b/src/DriverCGNS/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${CGNS_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
@@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 

diff --git a/src/DriverDAT/CMakeLists.txt b/src/DriverDAT/CMakeLists.txt
index f78ad7893da67ccf8060071c63f29b7869c75b07..91ba878eb5fde4161c3d2312e6bbb97b59d08ab2 100644 (file)
--- a/src/DriverDAT/CMakeLists.txt
+++ b/src/DriverDAT/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/Driver
@@ -32,13 +32,13 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL}
+  ${OpenCASCADE_KERNEL}
   ${KERNEL_SALOMEBasics}
   ${KERNEL_SalomeIDLKERNEL}
   MeshDriver

diff --git a/src/DriverGMF/CMakeLists.txt b/src/DriverGMF/CMakeLists.txt
index 7f2c29651607ae5ce44736893fcf59d9ffc0fe19..a04b58c9fed589dcd4a621d383c24d8dab1b5722 100644 (file)
--- a/src/DriverGMF/CMakeLists.txt
+++ b/src/DriverGMF/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/Driver
@@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   "-DBOOST_SYSTEM_NO_DEPRECATED"
 )

diff --git a/src/DriverMED/CMakeLists.txt b/src/DriverMED/CMakeLists.txt
index c392d12ac5b53e2ea9b5fd95190b54610336b6df..6ddace44d857a6bbe7e66671fe5a9eb357039b86 100644 (file)
--- a/src/DriverMED/CMakeLists.txt
+++ b/src/DriverMED/CMakeLists.txt
@@ -22,7 +22,7 @@
 INCLUDE_DIRECTORIES(
   ${HDF5_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base
@@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${HDF5_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 

diff --git a/src/DriverSTL/CMakeLists.txt b/src/DriverSTL/CMakeLists.txt
index 53aef6ea33c9e82014f4787f99b83b53fa68d55d..59b6967279c63cfbae6966dece7f9a01b5a2b7b8 100644 (file)
--- a/src/DriverSTL/CMakeLists.txt
+++ b/src/DriverSTL/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/Driver
@@ -32,16 +32,15 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKernel}
-  ${CAS_TKSTL}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKMesh}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_DataExchange_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${KERNEL_SALOMEBasics}
   MeshDriver
   SMDS
@@ -53,11 +52,9 @@ SET(_link_LIBRARIES_bin
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SALOMEBasics}
   ${KERNEL_SalomeIDLKERNEL}
-  ${CAS_TKernel}
-  ${CAS_TKSTL}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKMesh}
-  ${CAS_TKBO}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_DataExchange_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   MeshDriver
   SMDS
 )

diff --git a/src/DriverUNV/CMakeLists.txt b/src/DriverUNV/CMakeLists.txt
index 86897560619950f456a6ff86132bc884e9ff7adb..8cafb88d42449a7c219d573eb9f57c13b3cf756e 100644 (file)
--- a/src/DriverUNV/CMakeLists.txt
+++ b/src/DriverUNV/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/Driver
@@ -32,13 +32,13 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL}
+  ${OpenCASCADE_KERNEL}
   ${KERNEL_SALOMEBasics}
   MeshDriver
 )

diff --git a/src/MEFISTO2/CMakeLists.txt b/src/MEFISTO2/CMakeLists.txt
index 6fd089d4ff423fd53f1fcee7cad0a810ffdf3546..05e39b1b2c9cc9865f26c61d8bd2d74494b6d961 100644 (file)
--- a/src/MEFISTO2/CMakeLists.txt
+++ b/src/MEFISTO2/CMakeLists.txt
@@ -21,20 +21,19 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
   ${PLATFORM_INCLUDES}
 )
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKernel}
-  ${CAS_TKMath}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
 )
 

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 24999862f7f658b73bd8ce9ce1ed1bd4a263712c..a56ff7f9db73b5886cf1c9f9ecb73cc10b78acb8 100644 (file)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(
   ${MEDFILE_INCLUDE_DIRS}
   ${QWT_INCLUDE_DIR}
   ${GEOM_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
@@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
@@ -52,7 +52,7 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
   ${VTK_LIBRARIES}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_KERNEL}
   ${GEOM_GEOMObject}
   ${GUI_SalomeApp}
   ${GUI_SalomeObject}

diff --git a/src/PluginUtils/CMakeLists.txt b/src/PluginUtils/CMakeLists.txt
index b72bb89aea9894656afa64e55098914a5cae45de..ca7c44665cebe4c13db59fd5516fb11b4a2d1463 100644 (file)
--- a/src/PluginUtils/CMakeLists.txt
+++ b/src/PluginUtils/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
@@ -46,8 +46,8 @@ SET(_link_LIBRARIES
   ${KERNEL_SalomeIDLKernel}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SalomeLifeCycleCORBA}
-  ${CAS_TKBRep}
-  ${CAS_TKV3d}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_Visualization_LIBRARIES}
   ${QT_LIBRARIES}
   ${QT_MT_LIBS}
   ${GUI_SalomeObject}

diff --git a/src/SMESH/CMakeLists.txt b/src/SMESH/CMakeLists.txt
index 7858c1c4aed5d17161a0c351e7d84c8a79e5309a..0aec18be916e1340cc279e0d8671c07b6e5da632 100644 (file)
--- a/src/SMESH/CMakeLists.txt
+++ b/src/SMESH/CMakeLists.txt
@@ -22,7 +22,7 @@
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
@@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -53,10 +53,9 @@ ENDIF(SALOME_SMESH_USE_CGNS)
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKShHealing}
-  ${CAS_TKPrim}
-  ${CAS_TKG2d}
-  ${CAS_TKCDF}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_ApplicationFramework_LIBRARIES}
   ${GEOM_NMTTools}
   ${GEOM_GEOMUtils}
   ${Boost_LIBRARIES}

diff --git a/src/SMESHClient/CMakeLists.txt b/src/SMESHClient/CMakeLists.txt
index 4ac6d4322a9f651cb743a8639bf5ddbafd9e6f1e..e8c582ffe5833712cdc966ef41b580e05823ccd8 100644 (file)
--- a/src/SMESHClient/CMakeLists.txt
+++ b/src/SMESHClient/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
   ${GEOM_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/Controls
   ${PROJECT_SOURCE_DIR}/src/Driver
@@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -64,7 +64,7 @@ SET(_link_LIBRARIES
   ${KERNEL_SALOMELocalTrace}
   ${GEOM_NMTDS}
   ${GEOM_SalomeIDLGEOM}  
-  ${CAS_KERNEL}
+  ${OpenCASCADE_KERNEL}
   SalomeIDLSMESH
   SMDS
   SMESHimpl

diff --git a/src/SMESHDS/CMakeLists.txt b/src/SMESHDS/CMakeLists.txt
index e5c153ceae634850a87c02347701cb2497501081..c68058be62e594fddc9c88000f0446bd866804ab 100644 (file)
--- a/src/SMESHDS/CMakeLists.txt
+++ b/src/SMESHDS/CMakeLists.txt
@@ -26,7 +26,7 @@ ENDIF(SALOME_SMESH_USE_TBB)
 
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/SMDS
@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -45,8 +45,8 @@ ENDIF(SALOME_SMESH_USE_TBB)
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL}
-  ${CAS_TKBRep}
+  ${OpenCASCADE_KERNEL}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
   SMDS
   ${TBB_LIBS}

diff --git a/src/SMESHFiltersSelection/CMakeLists.txt b/src/SMESHFiltersSelection/CMakeLists.txt
index 366df239946ac4445d65e5ce71726c6fa572e4e0..9c9bf99c5f94f7bac88db962e281628e0921f4a8 100644 (file)
--- a/src/SMESHFiltersSelection/CMakeLists.txt
+++ b/src/SMESHFiltersSelection/CMakeLists.txt
@@ -20,7 +20,7 @@
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PYTHON_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
@@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
 )
 
 # libraries to link to
@@ -49,9 +49,8 @@ SET(_link_LIBRARIES
   ${GUI_LightApp}
   ${GEOM_GEOM}
   ${GEOM_GEOMClient}
-  ${CAS_TKernel}
-  ${CAS_TKMath}
-  ${CAS_TKBRep}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
   SalomeIDLSMESH
 )
 

diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt
index b3acd18ac98e08c4d317cf1d817b222180475513..13d5549c08730c66278ce43c674dd79ba5e702e8 100644 (file)
--- a/src/SMESHGUI/CMakeLists.txt
+++ b/src/SMESHGUI/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${VTK_INCLUDE_DIRS}
   ${OGL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -49,7 +49,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
@@ -61,7 +61,7 @@ ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKV3d}
+  ${OpenCASCADE_Visualization_LIBRARIES}
   ${GUI_SalomePrs}
   ${GUI_suit}
   ${GUI_SUITApp}

diff --git a/src/SMESHUtils/CMakeLists.txt b/src/SMESHUtils/CMakeLists.txt
index c21a8a6d5c4d8e8493a50531b66bb1eff76f0e87..f4099bc5ee329285e226ca1e7f07d63f2eccac4c 100644 (file)
--- a/src/SMESHUtils/CMakeLists.txt
+++ b/src/SMESHUtils/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/SMDS
@@ -29,24 +29,17 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKShHealing}
-  ${CAS_TKPrim}
-  ${CAS_TKernel}
-  ${CAS_TKBRep}
-  ${CAS_TKG2d}
-  ${CAS_TKG3d}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKMesh}
-  ${Boost_LIBRARIES}
-  SMDS
+   ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+   ${OpenCASCADE_FoundationClasses_LIBRARIES}
+   ${OpenCASCADE_ModelingData_LIBRARIES}
+   ${Boost_LIBRARIES}
+   SMDS
 )
 
 # --- headers ---

diff --git a/src/SMESH_I/CMakeLists.txt b/src/SMESH_I/CMakeLists.txt
index f8fabc08cd59a31f9d1d231e58cf4400f932274e..8be022d98111b985d975528e72c0c9e7bd551188 100644 (file)
--- a/src/SMESH_I/CMakeLists.txt
+++ b/src/SMESH_I/CMakeLists.txt
@@ -21,7 +21,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
@@ -45,7 +45,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -70,11 +70,10 @@ SET(_link_LIBRARIES
   ${KERNEL_SalomeGenericObj}
   ${KERNEL_SalomeIDLKERNEL}
   ${KERNEL_SALOMELocalTrace}
-  ${CAS_TKCDF}
-  ${CAS_TKBO}
-  ${CAS_TKShHealing}
+  ${OpenCASCADE_ApplicationFramework_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${GEOM_GEOMClient}
-  ${GEOM_SalomeIDLGEOM}  
+  ${GEOM_SalomeIDLGEOM}
   SalomeIDLSMESH
   SMESHimpl
   SMDS

diff --git a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
index 4132fa9a31887dda89af12777b08218ea7e5a4a2..db3afef431a89d11fbc9b2c57a1151bd43afe417 100644 (file)
--- a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${PYTHON_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OGL_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
@@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
 )

diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt
index c0097c64a27f2b02d3039ab977164d89605cbf9e..17a03916c6f34407499c97d5d6e3286c1c4e86b9 100644 (file)
--- a/src/StdMeshers/CMakeLists.txt
+++ b/src/StdMeshers/CMakeLists.txt
@@ -25,7 +25,7 @@ IF(SALOME_SMESH_USE_TBB)
 ENDIF(SALOME_SMESH_USE_TBB)
 
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
@@ -46,7 +46,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -58,10 +58,8 @@ ENDIF(SALOME_SMESH_USE_TBB)
 SET(_link_LIBRARIES
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_OpUtil}
-  ${CAS_TKAdvTools}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKG3d}
-  ${CAS_TKOffset}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} 
+  ${OpenCASCADE_ModelingData_LIBRARIES}
   ${GEOM_GEOMUtils}
   SMESHimpl
   SMESHDS

diff --git a/src/StdMeshersGUI/CMakeLists.txt b/src/StdMeshersGUI/CMakeLists.txt
index 1b390d361f1d5083aaa92e7b755d231b327f5e5b..999891b5b3ddc1031be6e7aeb01c9b62a6eb5021 100644 (file)
--- a/src/StdMeshersGUI/CMakeLists.txt
+++ b/src/StdMeshersGUI/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(UseQtExt)
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${VTK_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -48,7 +48,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QWT_DEFINITIONS}
@@ -57,9 +57,8 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${GUI_SalomeApp}
-  ${CAS_TKernel}
-  ${CAS_TKBO}
-  ${CAS_TKAdvTools}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${QWT_LIBRARY}
   SalomeIDLSMESH
   SMESHFiltersSelection

diff --git a/src/StdMeshers_I/CMakeLists.txt b/src/StdMeshers_I/CMakeLists.txt
index 04e09cfb6445d68254607ffd85d9abb5c01708c0..bcbb3fe2ee717f80670a46782a54664e6e96a417 100644 (file)
--- a/src/StdMeshers_I/CMakeLists.txt
+++ b/src/StdMeshers_I/CMakeLists.txt
@@ -20,7 +20,7 @@
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
@@ -47,7 +47,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
@@ -61,8 +61,7 @@ ENDIF(WIN32)
 SET(_link_LIBRARIES
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SalomeGenericObj}
-  ${CAS_TKBRep}
-  ${CAS_TKG3d}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
   SalomeIDLSMESH
   StdMeshers
   SMESHEngine

diff --git a/src/Tools/padder/meshjob/impl/CMakeLists.txt b/src/Tools/padder/meshjob/impl/CMakeLists.txt
index 28ab36e1145efb028c2bd6468966b9ac3d7d1b9f..fb2ac2df07ac52b5aa280700fbea2f170bb12535 100644 (file)
--- a/src/Tools/padder/meshjob/impl/CMakeLists.txt
+++ b/src/Tools/padder/meshjob/impl/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
@@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${LIBXML2_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}