From 4e8ac9af60236e6d6ce2e55258c119f5ebcacf7f Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:23:23 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 2 +- src/GUI/CMakeLists.txt | 6 +++--- src/HEXABLOCKPlugin/CMakeLists.txt | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c62d9a6..30e7a77 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,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 998f665..689d92b 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES( ${SMESH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/idl ) @@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS( ${QT_DEFINITIONS} ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -50,7 +50,7 @@ SET(_link_LIBRARIES ${GUI_suit} ${SMESH_SMESH} ${KERNEL_SALOMELocalTrace} - ${CAS_KERNEL} + ${OpenCASCADE_FoundationClasses_LIBRARIES} SalomeIDLHEXABLOCKPLUGIN ) diff --git a/src/HEXABLOCKPlugin/CMakeLists.txt b/src/HEXABLOCKPlugin/CMakeLists.txt index ec9a166..175e7a9 100644 --- a/src/HEXABLOCKPlugin/CMakeLists.txt +++ b/src/HEXABLOCKPlugin/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} ${HEXABLOCK_INCLUDE_DIRS} @@ -34,18 +34,18 @@ 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} + TKBRep + TKG2d + TKG3d + TKTopAlgo + TKGeomBase + TKGeomAlgo ${HEXABLOCK_HEXABLOCKEngine} ${SMESH_SMESHimpl} ${SMESH_SMESHEngine} -- 2.39.2