From 9a0b6f1912a73ab3f216bb8081b47e829248262a Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:40:07 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 2 +- src/BLSURFPlugin/CMakeLists.txt | 16 +++++----------- src/GUI/CMakeLists.txt | 6 +++--- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 585cac6..4fcb40b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,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/BLSURFPlugin/CMakeLists.txt b/src/BLSURFPlugin/CMakeLists.txt index d6e1a18..f1d7ac7 100644 --- a/src/BLSURFPlugin/CMakeLists.txt +++ b/src/BLSURFPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${MESHGEMS_INCLUDE_DIRS} ${SMESH_INCLUDE_DIRS} @@ -37,22 +37,16 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES ${PYTHON_LIBRARIES} - ${CAS_TKBRep} - ${CAS_TKGeomBase} - ${CAS_TKGeomAlgo} - ${CAS_TKTopAlgo} - ${CAS_TKXCAF} - ${CAS_TKXSBase} - ${CAS_TKG2d} - ${CAS_TKG3d} - ${CAS_TKShHealing} + ${OpenCASCADE_ModelingData_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} + ${OpenCASCADE_DataExchange_LIBRARIES} ${MESHGEMS_CADSURF_LIBRARY} ${SMESH_SMESHimpl} ${SMESH_SMESHEngine} diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index 4a13b7d..b5e2637 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE(UseQtExt) # additional include directories INCLUDE_DIRECTORIES( ${QT_INCLUDES} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PYTHON_INCLUDES} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS( ${QT_DEFINITIONS} ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -62,7 +62,7 @@ SET(_link_LIBRARIES ${SMESH_PluginUtils} ${SMESH_StdMeshersGUI} ${SMESH_SMESHFiltersSelection} - ${CAS_KERNEL} + ${OpenCASCADE_FoundationClasses_LIBRARIES} ${MESHGEMS_LIBRARIES} SalomeIDLBLSURFPLUGIN BLSURFEngine -- 2.39.2