Remove Salomemesh from LibPack and compile with source. Changes for LibPack 8.1

Had to overwrite the salomemesh in 3rdParty with the original 5.1.2.2 from sf.net since through layout changes imposible to merge or even see changes in the code. Linux tweaking has to be done..
This commit is contained in:
jriegel
2013-03-31 00:16:04 +01:00
parent 82e07c46c9
commit 7bedde5b4f
188 changed files with 4030 additions and 11788 deletions

View File

@@ -15,7 +15,7 @@ include_directories(
${PYTHON_INCLUDE_PATH}
${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc
)
link_directories(${OCC_LIBRARY_DIR})
@@ -24,8 +24,9 @@ set(Fem_LIBS
Part
Mesh
FreeCADApp
${SMESH_LIBRARIES}
${SMESH_DEBUG_LIBRARIES}
StdMeshers
NETGENPlugin
SMESH
)
generate_from_xml(FemMeshPy)

View File

@@ -15,7 +15,7 @@ include_directories(
${SOQT_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
${XERCESC_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc
)
link_directories(${OCC_LIBRARY_DIR})

View File

@@ -4,38 +4,32 @@ else(MSVC)
add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
endif(MSVC)
if (SMESH_FOUND)
add_definitions(-DHAVE_SMESH)
endif(SMESH_FOUND)
add_definitions(-DHAVE_SMESH)
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
${XERCESC_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}
)
if(SMESH_FOUND)
include_directories(
${SMESH_INCLUDE_DIR}
)
endif(SMESH_FOUND)
link_directories(${OCC_LIBRARY_DIR})
if(SMESH_FOUND)
set(MeshPart_LIBS
Part
Mesh
${SMESH_LIBRARIES}
${SMESH_DEBUG_LIBRARIES}
StdMeshers
NETGENPlugin
SMESH
)
else(SMESH_FOUND)
set(MeshPart_LIBS
Part
Mesh
)
endif(SMESH_FOUND)
SET(MeshPart_SRCS
AppMeshPart.cpp