[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.5.1_beta2_svn11845_dfsg-2-12-g0baf713
Anton Gladky
gladky.anton at gmail.com
Thu May 24 19:19:10 UTC 2012
The following commit has been merged in the master branch:
commit 764336cce1556ce147fd8cfd6c60525061525dca
Merge: b75813322d95879476d581c9ac18bc3108f6dd06 2d76517f81d6f9e840e58d8f0b2ea21064c246b8
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Thu May 24 20:29:28 2012 +0200
Merge tag 'upstream/2.5.1_beta2_svn12143_dfsg'
Upstream version 2.5.1~beta2~svn12143~dfsg
diff --combined CMakeLists.txt
index 12de19e,19856a4..097dfbb
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -37,6 -37,7 +37,7 @@@ option(ENABLE_FL_TREE "Enable FLTK tre
option(ENABLE_FOURIER_MODEL "Enable Fourier geometrical models" OFF)
option(ENABLE_GMM "Enable GMM linear algebra solvers" ${DEFAULT})
option(ENABLE_GRAPHICS "Compile-in OpenGL graphics even if there is no GUI" OFF)
+ option(ENABLE_OPTHOM "Enable optimization tool for high order meshes" ${DEFAULT})
option(ENABLE_KBIPACK "Enable Kbipack for homology solver" ${DEFAULT})
option(ENABLE_MATHEX "Enable MathEx expression parser" ${DEFAULT})
option(ENABLE_MED "Enable MED mesh and post-processing file formats" ${DEFAULT})
@@@ -90,7 -91,7 +91,7 @@@ set(GMSH_AP
Geo/MVertexBoundaryLayerData.h Geo/MEdge.h
Geo/MFace.h Geo/MElement.h Geo/MPoint.h Geo/MLine.h Geo/MTriangle.h
Geo/MQuadrangle.h Geo/MTetrahedron.h Geo/MHexahedron.h Geo/MPrism.h
- Geo/MPyramid.h Geo/MElementCut.h Geo/discreteVertex.h Geo/discreteEdge.h
+ Geo/MPyramid.h Geo/MElementCut.h Geo/MElementOctree.h Geo/discreteVertex.h Geo/discreteEdge.h
Geo/discreteFace.h Geo/discreteRegion.h Geo/SPoint2.h Geo/SPoint3.h
Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h Geo/Pair.h Geo/Range.h
Geo/SOrientedBoundingBox.h Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h
@@@ -108,6 -109,9 +109,9 @@@
contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h
contrib/kbipack/gmp_blas.h contrib/kbipack/mpz.h
contrib/DiscreteIntegration/Integration3D.h
+ contrib/HighOrderMeshOptimizer/OptHOM.h
+ contrib/HighOrderMeshOptimizer/OptHomMesh.h
+ contrib/HighOrderMeshOptimizer/ParamCoord.h
contrib/MathEx/mathex.h)
execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE DATE
@@@ -508,6 -512,13 +512,13 @@@ if(ENABLE_DINTEGRATION
set_config_option(HAVE_DINTEGRATION "DIntegration")
endif(ENABLE_DINTEGRATION)
+ if(ENABLE_OPTHOM)
+ add_subdirectory(contrib/HighOrderMeshOptimizer)
+ include_directories(contrib/HighOrderMeshOptimizer)
+ set_config_option(HAVE_OPTHOM "OptHom")
+ endif(ENABLE_OPTHOM)
+
+
if(ENABLE_KBIPACK)
find_library(GMP_LIB gmp)
if(GMP_LIB)
@@@ -804,6 -815,15 +815,6 @@@ if(HAVE_SOLVER
endif(HAVE_SOLVER)
if(ENABLE_OCC)
- if(WIN32 OR CYGWIN)
- if(HAVE_64BIT_SIZE_T)
- set(OCC_SYS_NAME win64)
- else(HAVE_64BIT_SIZE_T)
- set(OCC_SYS_NAME win32)
- endif(HAVE_64BIT_SIZE_T)
- else(WIN32 OR CYGWIN)
- set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
- endif(WIN32 OR CYGWIN)
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
@@@ -814,30 -834,6 +825,30 @@@
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
+ # First try to detect OpenCascade Community Edition, based on CMake
+ find_package(OCE QUIET COMPONENTS ${OCC_LIBS_REQUIRED})
+ if(OCE_ALL_FOUND)
+ list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS_REQUIRED})
+ list(APPEND EXTERNAL_INCLUDES ${OCE_INCLUDE_DIRS})
+ set_config_option(HAVE_OCC "OpenCascade(OCE)")
+ add_definitions(-DHAVE_NO_OCC_CONFIG_H)
+ if(HAVE_64BIT_SIZE_T)
+ add_definitions(-D_OCC64)
+ endif(HAVE_64BIT_SIZE_T)
+ if(CYGWIN)
+ list(APPEND EXTERNAL_LIBRARIES "winspool")
+ elseif(MSVC)
+ add_definitions(-DWNT)
+ endif(CYGWIN)
+ else(OCE_ALL_FOUND)
+ if(OCE_FOUND)
+ message(STATUS "Found OCE version ${OCE_VERSION}, but those libraries are missing: " ${OCE_MISSING_TOOLKITS})
+ endif(OCE_FOUND)
+ if(WIN32 OR CYGWIN)
+ set(OCC_SYS_NAME win32)
+ else(WIN32 OR CYGWIN)
+ set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
+ endif(WIN32 OR CYGWIN)
list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
set(OCC_LIBS)
foreach(OCC ${OCC_LIBS_REQUIRED})
@@@ -874,7 -870,6 +885,7 @@@
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
+ endif(OCE_ALL_FOUND)
if(HAVE_OCC AND ENABLE_SALOME)
add_subdirectory(contrib/Salome)
include_directories(contrib/Salome)
@@@ -1022,7 -1017,7 +1033,7 @@@ endforeach(DIR
# want to build the lib we need to recompile everything (the first
# time--it's a separate target)
add_library(lib STATIC EXCLUDE_FROM_ALL ${GMSH_SRC})
-set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
+set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
@@@ -1032,7 -1027,7 +1043,7 @@@ endif(MSVC
# shared library target: we don't build it by default either
add_library(shared SHARED EXCLUDE_FROM_ALL ${GMSH_SRC})
-set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
+set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh1)
if(HAVE_LAPACK AND LAPACK_FLAGS)
set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
endif(HAVE_LAPACK AND LAPACK_FLAGS)
@@@ -1040,7 -1035,7 +1051,7 @@@ if(MSVC AND ENABLE_MSVC_STATIC_RUNTIME
message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
"Change in msvc /MT flag to /MD in the shared project properties")
endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)
-target_link_libraries(shared ${LINK_LIBRARIES})
+target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut)
# binary targets
if(HAVE_FLTK)
@@@ -1055,7 -1050,7 +1066,7 @@@ else(HAVE_FLTK
add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
target_link_libraries(gmsh_dynamic shared)
endif(HAVE_FLTK)
-target_link_libraries(gmsh ${LINK_LIBRARIES})
+target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
# increase stack to 16Mb on Windows to avoid overflows in recursive
# tet classification for large 3D Delaunay grids + force static
@@@ -1103,7 -1098,7 +1114,7 @@@ if(UNIX
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
-set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
+#set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
@@@ -1180,7 -1175,7 +1191,7 @@@ if(MAKEINFO
ARGS ${TEX_DIR}/gmsh.texi WORKING_DIRECTORY ${TEX_DIR})
add_custom_target(txt DEPENDS ${TEX_DIR}/gmsh.txt)
add_custom_command(OUTPUT ${TEX_DIR}/gmsh.html DEPENDS ${TEX_SRC}
- COMMAND ${MAKEINFO} --html --no-split
+ COMMAND ${MAKEINFO} --html --css-ref=http://geuz.org/geuz.css --no-split
ARGS ${TEX_DIR}/gmsh.texi WORKING_DIRECTORY ${TEX_DIR})
add_custom_target(html DEPENDS ${TEX_DIR}/gmsh.html)
install(FILES ${TEX_DIR}/gmsh.html DESTINATION ${GMSH_DOC} OPTIONAL)
@@@ -1198,7 -1193,7 +1209,7 @@@ endif(TEXI2PDF
if(MAKEINFO AND TEXI2PDF)
add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
- doc/CREDITS.txt doc/LICENSE.txt doc/VERSIONS.txt
+ doc/CREDITS.txt doc/VERSIONS.txt
doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info
doc/texinfo/gmsh.pdf doc/texinfo/gmsh.txt
COMMAND ${CMAKE_COMMAND} -E remove ${TEX_OBJ}
--
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.
More information about the debian-science-commits
mailing list