From: prascle Date: Wed, 20 Mar 2013 10:27:44 +0000 (+0000) Subject: PR: synchro V7_main tag mergefrom_V6_main_19Mar13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a6a291ea7ccfe1e2c9d0d26330b3107e9c14bff8;p=plugins%2Fnetgenplugin.git PR: synchro V7_main tag mergefrom_V6_main_19Mar13 --- diff --git a/adm_local/cmake_files/FindNETGEN.cmake b/adm_local/cmake_files/FindNETGEN.cmake index 1b2209f..c64662d 100644 --- a/adm_local/cmake_files/FindNETGEN.cmake +++ b/adm_local/cmake_files/FindNETGEN.cmake @@ -23,34 +23,62 @@ SET(NETGEN_INCLUDES) SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -I${NETGEN_INCLUDES_DIR} -I${NETGENHOME}/share/netgen/include) SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -DNO_PARALLEL_THREADS -DOCCGEOMETRY) +SET(NETGEN_LIBS) +FIND_LIBRARY(NETGEN_LIB_csg csg PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +#FIND_LIBRARY(NETGEN_LIB_gen gen PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +FIND_LIBRARY(NETGEN_LIB_geom2d geom2d PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +#FIND_LIBRARY(NETGEN_LIB_gprim gprim PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +FIND_LIBRARY(NETGEN_LIB_interface interface PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +#FIND_LIBRARY(NETGEN_LIB_la la PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +FIND_LIBRARY(NETGEN_LIB_mesh mesh PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +FIND_LIBRARY(NETGEN_LIB_occ occ PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) +FIND_LIBRARY(NETGEN_LIB_stl stl PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) FIND_LIBRARY(NETGEN_LIB_nglib nglib PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) -# temporary, check to be added later +FOREACH(LIBNAME + ${NETGEN_LIB_csg} +# ${NETGEN_LIB_gen} + ${NETGEN_LIB_geom2d} +# ${NETGEN_LIB_gprim} + ${NETGEN_LIB_interface} +# ${NETGEN_LIB_la} + ${NETGEN_LIB_mesh} + ${NETGEN_LIB_occ} + ${NETGEN_LIB_stl} + ${NETGEN_LIB_nglib} + ) + IF(LIBNAME) + SET(NETGEN_LIBS ${NETGEN_LIBS} ${LIBNAME}) + ENDIF(LIBNAME) +ENDFOREACH(LIBNAME ) + +# Check Netgen version SET(NETGEN_V5 OFF) +SET(tmp_check_netgen ${CMAKE_BINARY_DIR}/tmp_check_netgen.cxx) +FILE(WRITE ${tmp_check_netgen} + "#include \n" + "#include \n" + "namespace nglib { \n" + "#include \"nglib.h\" \n" + "} \n" + "#include \n" + "int main() { \n" + "nglib::Ng_Init(); \n" + "netgen::Mesh* ngMesh; \n" + "ngMesh->CalcLocalH(1.0); \n" + "nglib::Ng_Exit(); \n" + "return 0; \n" + "} \n" + ) +TRY_COMPILE(NETGEN_V5 + ${CMAKE_BINARY_DIR} + ${tmp_check_netgen} + CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${NETGEN_LIB_nglib}" + COMPILE_DEFINITIONS ${CAS_CPPFLAGS} ${NETGEN_INCLUDES} + OUTPUT_VARIABLE OUTPUT + ) +FILE(REMOVE ${tmp_check_netgen}) IF(NETGEN_V5) SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -DNETGEN_V5) ENDIF(NETGEN_V5) - -SET(NETGEN_LIBS) -IF(WINDOWS) - FIND_LIBRARY(NETGEN_LIB_csg csg PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_gen gen PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_geom2d geom2d PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_gprim gprim PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_interface interface PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_la la PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_mesh mesh PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_occ occ PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - FIND_LIBRARY(NETGEN_LIB_stl stl PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_csg}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_gen}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_geom2d}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_gprim}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_interface}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_la}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_mesh}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_occ}) - SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_stl}) -ENDIF(WINDOWS) -SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_nglib}) diff --git a/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt b/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt index 5f55b68..868561c 100755 --- a/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt @@ -23,7 +23,7 @@ SET(top_builddir ${CMAKE_BINARY_DIR}) SET(top_srcdir ${CMAKE_SOURCE_DIR}) SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR}) SET(builddir ${CMAKE_CURRENT_BINARY_DIR}) -SET(datadir${CMAKE_INSTALL_PREFIX}/share) +SET(datadir ${CMAKE_INSTALL_PREFIX}/share) SET(docdir ${datadir}/doc/salome) SET(guidocdir ${docdir}/gui/NETGENPLUGIN) @@ -56,7 +56,9 @@ IF(WINDOWS) SET(CALL_STR "call") ELSE(WINDOWS) SET(DOC_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/bin/salome:${SMESH_ROOT_DIR}/bin/salome:${SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${MED_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${GEOM_ROOT_DIR}/bin/salome:${GEOM_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${KERNEL_ROOT_DIR}/bin/salome:${KERNEL_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${OMNIORB_ROOT_USER}/lib/python${PYTHON_VERSION}/site-packages:${OMNIORB_ROOT_USER}/lib64/python${PYTHON_VERSION}/site-packages) - SET(SCR "export PYTHONPATH=${DOC_PYTHONPATH}:${PYTHONPATH} + SET(DOC_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/lib/salome:${SMESH_ROOT_DIR}/lib/salome:${MED_ROOT_DIR}/lib/salome:${GEOM_ROOT_DIR}/lib/salome:${KERNEL_ROOT_DIR}/lib/salome") + SET(SCR "export PYTHONPATH=${DOC_PYTHONPATH}:\${PYTHONPATH} + export LD_LIBRARY_PATH=${DOC_LD_LIBRARY_PATH}:\${LD_LIBRARY_PATH} export SMESH_MeshersList=${DOC_SMESH_MeshersList} ") SET(EXT "sh") diff --git a/doc/salome/gui/NETGENPLUGIN/static/header.html.in b/doc/salome/gui/NETGENPLUGIN/static/header.html.in index 4571b43..d434d83 100755 --- a/doc/salome/gui/NETGENPLUGIN/static/header.html.in +++ b/doc/salome/gui/NETGENPLUGIN/static/header.html.in @@ -5,6 +5,8 @@ $title + + $treeview $search $mathjax diff --git a/doc/salome/gui/NETGENPLUGIN/static/header_py.html.in b/doc/salome/gui/NETGENPLUGIN/static/header_py.html.in index 61414bb..22abb14 100644 --- a/doc/salome/gui/NETGENPLUGIN/static/header_py.html.in +++ b/doc/salome/gui/NETGENPLUGIN/static/header_py.html.in @@ -5,6 +5,8 @@ $title + + $treeview $search $mathjax