From 694a169d24e96bf1e08c4e2811099cb3f3411526 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:17:39 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 2 +- src/GUI/CMakeLists.txt | 6 +++--- src/HexoticPlugin/CMakeLists.txt | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a76f793..d97e4b1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,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 c9d56b3..33c811b 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -25,7 +25,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} ) @@ -52,7 +52,7 @@ SET(_link_LIBRARIES ${SMESH_SMESH} ${SMESH_StdMeshersGUI} ${SMESH_PluginUtils} - ${CAS_KERNEL} + ${OpenCASCADE_FoundationClasses_LIBRARIES} ${GUI_suit} ${GUI_qtx} ${GUI_SalomeApp} diff --git a/src/HexoticPlugin/CMakeLists.txt b/src/HexoticPlugin/CMakeLists.txt index 38e1ea4..372510e 100644 --- a/src/HexoticPlugin/CMakeLists.txt +++ b/src/HexoticPlugin/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${SMESH_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${MESHGEMS_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} @@ -36,17 +36,17 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKernel} - ${CAS_TKMath} - ${CAS_TKG3d} - ${CAS_TKTopAlgo} - ${CAS_TKBRep} + TKernel + TKMath + TKG3d + TKTopAlgo + TKBRep ${CAS_SALOMELocalTrace} ${MESHGEMS_HEXA_LIBRARY} ${SMESH_SMESHimpl} -- 2.39.2