ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-16 14:01:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Migration to OpenCASCADE CMake configuration

Browse Source
This commit is contained in:
rnv 2017-02-15 18:15:18 +03:00
parent 9655cb578d
commit 0cfa6d5855
24 changed files with 87 additions and 108 deletions
CMakeLists.txt
src
Controls
CMakeLists.txt
Driver
CMakeLists.txt
DriverCGNS
CMakeLists.txt
DriverDAT
CMakeLists.txt
DriverGMF
CMakeLists.txt
DriverMED
CMakeLists.txt
DriverSTL
CMakeLists.txt
DriverUNV
CMakeLists.txt
MEFISTO2
CMakeLists.txt
OBJECT
CMakeLists.txt
PluginUtils
CMakeLists.txt
SMESH
CMakeLists.txt
SMESHClient
CMakeLists.txt
SMESHDS
CMakeLists.txt
SMESHFiltersSelection
CMakeLists.txt
SMESHGUI
CMakeLists.txt
SMESHUtils
CMakeLists.txt
SMESH_I
CMakeLists.txt
SMESH_SWIG_WITHIHM
CMakeLists.txt
StdMeshers
CMakeLists.txt
StdMeshersGUI
CMakeLists.txt
StdMeshers_I
CMakeLists.txt
Tools/padder/meshjob/impl
CMakeLists.txt

2
CMakeLists.txt

@ -191,7 +191,7 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR})
# VTK is obligatiry for the SMESH # VTK is obligatiry for the SMESH
FIND_PACKAGE(SalomeVTK REQUIRED) FIND_PACKAGE(SalomeVTK REQUIRED)
FIND_PACKAGE(SalomeCAS REQUIRED) FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
IF(SALOME_SMESH_USE_CGNS) IF(SALOME_SMESH_USE_CGNS)
FIND_PACKAGE(SalomeCGNS) FIND_PACKAGE(SalomeCGNS)

13
src/Controls/CMakeLists.txt

@ -20,7 +20,7 @@
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -31,19 +31,16 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${VTK_LIBRARIES} ${VTK_LIBRARIES}
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKBRep} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKG3d} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKTopAlgo}
${CAS_TKGeomBase}
${CAS_TKGeomAlgo}
SMDS SMDS
SMESHDS SMESHDS
SMESHUtils SMESHUtils

8
src/Driver/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMESHUtils ${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESHDS ${PROJECT_SOURCE_DIR}/src/SMESHDS
@ -29,15 +29,15 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${KERNEL_OpUtil} ${KERNEL_OpUtil}
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKTopAlgo} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
SMESHDS SMESHDS
SMESHUtils SMESHUtils
) )

4
src/DriverCGNS/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${CGNS_INCLUDE_DIRS} ${CGNS_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )

6
src/DriverDAT/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/Driver
@ -32,13 +32,13 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_KERNEL} ${OpenCASCADE_KERNEL}
${KERNEL_SALOMEBasics} ${KERNEL_SALOMEBasics}
${KERNEL_SalomeIDLKERNEL} ${KERNEL_SalomeIDLKERNEL}
MeshDriver MeshDriver

4
src/DriverGMF/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/Driver
@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
"-DBOOST_SYSTEM_NO_DEPRECATED" "-DBOOST_SYSTEM_NO_DEPRECATED"
) )

4
src/DriverMED/CMakeLists.txt

@ -22,7 +22,7 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base
@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${HDF5_DEFINITIONS} ${HDF5_DEFINITIONS}
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )

19
src/DriverSTL/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/Driver
@ -32,16 +32,15 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKSTL} ${OpenCASCADE_DataExchange_LIBRARIES}
${CAS_TKTopAlgo} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKMesh}
${KERNEL_SALOMEBasics} ${KERNEL_SALOMEBasics}
MeshDriver MeshDriver
SMDS SMDS
@ -53,11 +52,9 @@ SET(_link_LIBRARIES_bin
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_SALOMEBasics} ${KERNEL_SALOMEBasics}
${KERNEL_SalomeIDLKERNEL} ${KERNEL_SalomeIDLKERNEL}
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKSTL} ${OpenCASCADE_DataExchange_LIBRARIES}
${CAS_TKTopAlgo} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKMesh}
${CAS_TKBO}
MeshDriver MeshDriver
SMDS SMDS
) )

6
src/DriverUNV/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/Driver
@ -32,13 +32,13 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_KERNEL} ${OpenCASCADE_KERNEL}
${KERNEL_SALOMEBasics} ${KERNEL_SALOMEBasics}
MeshDriver MeshDriver
) )

7
src/MEFISTO2/CMakeLists.txt

@ -21,20 +21,19 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}
${PLATFORM_INCLUDES} ${PLATFORM_INCLUDES}
) )
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKMath}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
) )

6
src/OBJECT/CMakeLists.txt

@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
${MEDFILE_INCLUDE_DIRS} ${MEDFILE_INCLUDE_DIRS}
${QWT_INCLUDE_DIR} ${QWT_INCLUDE_DIR}
${GEOM_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
) )
@ -51,7 +51,7 @@ ADD_DEFINITIONS(
SET(_link_LIBRARIES SET(_link_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
${VTK_LIBRARIES} ${VTK_LIBRARIES}
${CAS_KERNEL} ${OpenCASCADE_KERNEL}
${GEOM_GEOMObject} ${GEOM_GEOMObject}
${GUI_SalomeApp} ${GUI_SalomeApp}
${GUI_SalomeObject} ${GUI_SalomeObject}

8
src/PluginUtils/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDES} ${QT_INCLUDES}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS}
@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
) )
@ -46,8 +46,8 @@ SET(_link_LIBRARIES
${KERNEL_SalomeIDLKernel} ${KERNEL_SalomeIDLKernel}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeLifeCycleCORBA}
${CAS_TKBRep} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKV3d} ${OpenCASCADE_Visualization_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${QT_MT_LIBS} ${QT_MT_LIBS}
${GUI_SalomeObject} ${GUI_SalomeObject}

11
src/SMESH/CMakeLists.txt

@ -22,7 +22,7 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}
@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
@ -53,10 +53,9 @@ ENDIF(SALOME_SMESH_USE_CGNS)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_TKShHealing} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKPrim} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKG2d} ${OpenCASCADE_ApplicationFramework_LIBRARIES}
${CAS_TKCDF}
${GEOM_NMTTools} ${GEOM_NMTTools}
${GEOM_GEOMUtils} ${GEOM_GEOMUtils}
${Boost_LIBRARIES} ${Boost_LIBRARIES}

6
src/SMESHClient/CMakeLists.txt

@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
${GEOM_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/Driver
@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
@ -64,7 +64,7 @@ SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${GEOM_NMTDS} ${GEOM_NMTDS}
${GEOM_SalomeIDLGEOM} ${GEOM_SalomeIDLGEOM}
${CAS_KERNEL} ${OpenCASCADE_KERNEL}
SalomeIDLSMESH SalomeIDLSMESH
SMDS SMDS
SMESHimpl SMESHimpl

8
src/SMESHDS/CMakeLists.txt

@ -26,7 +26,7 @@ ENDIF(SALOME_SMESH_USE_TBB)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMDS
@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
@ -45,8 +45,8 @@ ENDIF(SALOME_SMESH_USE_TBB)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_KERNEL} ${OpenCASCADE_KERNEL}
${CAS_TKBRep} ${OpenCASCADE_ModelingData_LIBRARIES}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
SMDS SMDS
${TBB_LIBS} ${TBB_LIBS}

9
src/SMESHFiltersSelection/CMakeLists.txt

@ -20,7 +20,7 @@
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES(
ADD_DEFINITIONS( ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
${PYTHON_DEFINITIONS} ${PYTHON_DEFINITIONS}
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
) )
# libraries to link to # libraries to link to
@ -48,9 +48,8 @@ SET(_link_LIBRARIES
${GUI_LightApp} ${GUI_LightApp}
${GEOM_GEOM} ${GEOM_GEOM}
${GEOM_GEOMClient} ${GEOM_GEOMClient}
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKMath} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKBRep}
SalomeIDLSMESH SalomeIDLSMESH
) )

6
src/SMESHGUI/CMakeLists.txt

@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
${QT_INCLUDES} ${QT_INCLUDES}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS} ${OGL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS}
@ -49,7 +49,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
) )
@ -61,7 +61,7 @@ ENDIF(WIN32)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_TKV3d} ${OpenCASCADE_Visualization_LIBRARIES}
${GUI_SalomePrs} ${GUI_SalomePrs}
${GUI_suit} ${GUI_suit}
${GUI_SUITApp} ${GUI_SUITApp}

17
src/SMESHUtils/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMDS
@ -29,22 +29,15 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${CAS_TKShHealing} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKPrim} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKernel} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKBRep}
${CAS_TKG2d}
${CAS_TKG3d}
${CAS_TKGeomBase}
${CAS_TKGeomAlgo}
${CAS_TKTopAlgo}
${CAS_TKMesh}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
SMDS SMDS
) )

9
src/SMESH_I/CMakeLists.txt

@ -21,7 +21,7 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
@ -45,7 +45,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
@ -70,9 +70,8 @@ SET(_link_LIBRARIES
${KERNEL_SalomeGenericObj} ${KERNEL_SalomeGenericObj}
${KERNEL_SalomeIDLKERNEL} ${KERNEL_SalomeIDLKERNEL}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${CAS_TKCDF} ${OpenCASCADE_ApplicationFramework_LIBRARIES}
${CAS_TKBO} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKShHealing}
${GEOM_GEOMClient} ${GEOM_GEOMClient}
${GEOM_SalomeIDLGEOM} ${GEOM_SalomeIDLGEOM}
SalomeIDLSMESH SalomeIDLSMESH

4
src/SMESH_SWIG_WITHIHM/CMakeLists.txt

@ -24,7 +24,7 @@ INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDES} ${QT_INCLUDES}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS} ${OGL_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
${PYTHON_DEFINITIONS} ${PYTHON_DEFINITIONS}
) )

10
src/StdMeshers/CMakeLists.txt

@ -25,7 +25,7 @@ IF(SALOME_SMESH_USE_TBB)
ENDIF(SALOME_SMESH_USE_TBB) ENDIF(SALOME_SMESH_USE_TBB)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -46,7 +46,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
) )
@ -58,10 +58,8 @@ ENDIF(SALOME_SMESH_USE_TBB)
SET(_link_LIBRARIES SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil} ${KERNEL_OpUtil}
${CAS_TKAdvTools} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKTopAlgo} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKG3d}
${CAS_TKOffset}
${GEOM_GEOMUtils} ${GEOM_GEOMUtils}
SMESHimpl SMESHimpl
SMESHDS SMESHDS

9
src/StdMeshersGUI/CMakeLists.txt

@ -24,7 +24,7 @@ INCLUDE(UseQtExt)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDES} ${QT_INCLUDES}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS}
@ -48,7 +48,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
${QWT_DEFINITIONS} ${QWT_DEFINITIONS}
@ -57,9 +57,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${GUI_SalomeApp} ${GUI_SalomeApp}
${CAS_TKernel} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${CAS_TKBO} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${CAS_TKAdvTools}
${QWT_LIBRARY} ${QWT_LIBRARY}
SalomeIDLSMESH SalomeIDLSMESH
SMESHFiltersSelection SMESHFiltersSelection

7
src/StdMeshers_I/CMakeLists.txt

@ -20,7 +20,7 @@
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS}
@ -47,7 +47,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}
) )
@ -61,8 +61,7 @@ ENDIF(WIN32)
SET(_link_LIBRARIES SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj} ${KERNEL_SalomeGenericObj}
${CAS_TKBRep} ${OpenCASCADE_ModelingData_LIBRARIES}
${CAS_TKG3d}
SalomeIDLSMESH SalomeIDLSMESH
StdMeshers StdMeshers
SMESHEngine SMESHEngine

4
src/Tools/padder/meshjob/impl/CMakeLists.txt

@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${CAS_INCLUDE_DIRS} ${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}
@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}
${BOOST_DEFINITIONS} ${BOOST_DEFINITIONS}
${LIBXML2_DEFINITIONS} ${LIBXML2_DEFINITIONS}
${OMNIORB_DEFINITIONS} ${OMNIORB_DEFINITIONS}