ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migration to OpenCASCADE CMake configuration

Browse Source
This commit is contained in:
rnv 2017-02-15 18:16:12 +03:00
parent 49d8574391
commit 9df5452f7d
3 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

6
src/GUI/CMakeLists.txt
View File

@ -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
)

38
src/NETGENPlugin/CMakeLists.txt
View File

@ -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}