From: rnv Date: Wed, 15 Feb 2017 15:15:18 +0000 (+0300) Subject: Migration to OpenCASCADE CMake configuration X-Git-Tag: V8_5_0a2^2~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97889f80acb2a7e5d7c9aaa2b6c6b2557014b49d;p=modules%2Fsmesh.git Migration to OpenCASCADE CMake configuration --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 083efdcec..9287dd86d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,7 +191,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 74798ca67..8f48ab1f2 100644 --- 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 96fb9645f..40d69423c 100644 --- 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 4ff5c9977..0cf686fb3 100644 --- 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 f78ad7893..91ba878eb 100644 --- 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 7f2c29651..a04b58c9f 100644 --- 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 c392d12ac..6ddace44d 100644 --- 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 53aef6ea3..59b696727 100644 --- 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 868975606..8cafb88d4 100644 --- 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 6fd089d4f..05e39b1b2 100644 --- 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 44940d59e..21b5ead3f 100644 --- a/src/OBJECT/CMakeLists.txt +++ b/src/OBJECT/CMakeLists.txt @@ -25,7 +25,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} @@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -51,7 +51,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 b72bb89ae..ca7c44665 100644 --- 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 7858c1c4a..0aec18be9 100644 --- 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 4ac6d4322..e8c582ffe 100644 --- 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 e5c153cea..c68058be6 100644 --- 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 9c13dc614..9c9bf99c5 100644 --- a/src/SMESHFiltersSelection/CMakeLists.txt +++ b/src/SMESHFiltersSelection/CMakeLists.txt @@ -20,7 +20,8 @@ # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} + ${QT_INCLUDES} ${PYTHON_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} @@ -36,7 +37,7 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS( ${OMNIORB_DEFINITIONS} ${PYTHON_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to @@ -48,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 4569e5e43..92e170356 100644 --- 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 707e7b0e3..ae011b71a 100644 --- 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,25 +29,18 @@ 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 f8fabc08c..8be022d98 100644 --- 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 8a252507c..5fe3f3256 100644 --- 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 c0097c64a..17a03916c 100644 --- 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 1b390d361..999891b5b 100644 --- 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 04e09cfb6..bcbb3fe2e 100644 --- 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 28ab36e11..fb2ac2df0 100644 --- 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}