From d50c12e0622ea604e30a18f90f3afac3c5a2a1c5 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:16:12 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 2 +- src/GUI/CMakeLists.txt | 6 +++--- src/NETGENPlugin/CMakeLists.txt | 38 +++++++-------------------------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a45ecf..2a0cecf 100755 --- 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 fa2db47..4baf20a 100644 --- 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 cf4120e..e5ea71c 100644 --- 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}