From 09c588f6213d81aec47601fa2aa025a6fed98671 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:24:50 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 2 +- src/GUI/CMakeLists.txt | 6 +++--- src/HYBRIDPlugin/CMakeLists.txt | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d24b94..e8251cd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,7 @@ ENDIF(SALOME_BUILD_GUI) # VTK FIND_PACKAGE(SalomeVTK REQUIRED) # OCCT -FIND_PACKAGE(SalomeCAS REQUIRED) +FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) # Find GEOM # =========== diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index 8e5642c..3947ad0 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_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} @@ -40,7 +40,7 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS( ${QT_DEFINITIONS} ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -56,7 +56,7 @@ SET(_link_LIBRARIES ${GUI_suit} ${GUI_qtx} ${GUI_SalomeApp} - ${CAS_KERNEL} + ${OpenCASCADE_FoundationClasses_LIBRARIES} SalomeIDLHYBRIDPLUGIN ) diff --git a/src/HYBRIDPlugin/CMakeLists.txt b/src/HYBRIDPlugin/CMakeLists.txt index caeb991..95915dc 100644 --- a/src/HYBRIDPlugin/CMakeLists.txt +++ b/src/HYBRIDPlugin/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${GEOM_INCLUDE_DIRS} ${SMESH_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} @@ -34,19 +34,19 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKBRep} - ${CAS_TKG2d} - ${CAS_TKG3d} - ${CAS_TKTopAlgo} - ${CAS_TKGeomBase} - ${CAS_TKGeomAlgo} - ${CAS_TKCDF} + TKBRep + TKG2d + TKG3d + TKTopAlgo + TKGeomBase + TKGeomAlgo + TKCDF ${MESHGEMS_HYBRID_LIBRARY} ${SMESH_SMESHimpl} ${SMESH_SMESHEngine} -- 2.39.2