suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Activating FEM for Linux again (without Netgen plugin)

Browse Source
This commit is contained in:
jriegel 2013-06-26 19:10:14 +02:00
parent 83b956e908
commit e1847a00f9
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -76,7 +76,7 @@ SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and
SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
MESSAGE( STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}")
MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}")
MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
@ -106,9 +106,11 @@ OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of th
if(MSVC)
OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" OFF)
OPTION(FREECAD_BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
else(MSVC)
set(FREECAD_USE_3DCONNEXION OFF)
OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
OPTION(FREECAD_BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
endif(MSVC)
# if this is set override some options

46
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@ -26,19 +26,34 @@ include_directories(
link_directories(${OCC_LIBRARY_DIR})
if(MSVC)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
${NGLIB_LIBRARIES}
${NGLIB_DEBUG_LIBRARIES}
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
if(FREECAD_BUILD_FEM_NETGEN)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
${NGLIB_LIBRARIES}
${NGLIB_DEBUG_LIBRARIES}
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
else(FREECAD_BUILD_FEM_NETGEN)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
endif(FREECAD_BUILD_FEM_NETGEN)
else(MSVC)
set(SMESH_LIBS
${OCC_LIBRARIES}
@ -417,7 +432,8 @@ endif(MSVC)
#ENDIF(MINGW)
# Disable for all other compilers but MSVC
if (MSVC)
if (FREECAD_BUILD_FEM_NETGEN)
################
# NETGENPlugin #
################
@ -442,7 +458,7 @@ else(MSVC)
set_target_properties(NETGENPlugin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin)
endif(MSVC)
endif (MSVC)
endif (FREECAD_BUILD_FEM_NETGEN)
#IF(WIN32)
# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DNETGENPluginimpl_EXPORTS ")

2
src/Mod/Fem/CMakeLists.txt
View File

@ -1,5 +1,4 @@
if (MSVC)
add_subdirectory(App)
if(FREECAD_BUILD_GUI)
add_subdirectory(Gui)
@ -16,4 +15,3 @@ INSTALL(
Mod/Fem
)
endif(MSVC)