[gmsh] 04/06: Update changelog.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jan 11 18:01:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit ec8e88ca8334049e1aeae509905d992fa1a495b4
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jan 3 11:02:24 2016 +0100
Update changelog.
---
CMakeLists.txt | 50 ++++++++++++++++++++++++++++--------------
Graphics/CMakeLists.txt | 1 -
debian/changelog | 8 +++++++
wrappers/gmshpy/__init__.py.in | 3 +++
wrappers/java/CMakeLists.txt | 10 ++++++---
5 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aff32d..4c5e18c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1099,15 +1099,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
@@ -1119,6 +1110,30 @@ if(ENABLE_OCC)
# FoundationClasses
# TKAdvTools -- not necessary? (and removed from OCC 6.8)
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)
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
@@ -1163,6 +1178,7 @@ if(ENABLE_OCC)
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
+ endif(OCE_ALL_FOUND)
if(HAVE_OCC)
if(ENABLE_SGEOM)
add_subdirectory(contrib/SGEOM)
@@ -1466,7 +1482,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${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)
@@ -1493,10 +1509,10 @@ endif(ENABLE_BUILD_ANDROID)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
- set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
+ set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
set_target_properties(shared PROPERTIES
VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
- SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
+ SOVERSION ${GMSH_MAJOR_VERSION})
if(HAVE_LAPACK AND LAPACK_FLAGS)
set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
endif(HAVE_LAPACK AND LAPACK_FLAGS)
@@ -1527,7 +1543,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
-target_link_libraries(gmsh ${LINK_LIBRARIES})
+target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
# Windows specific linker options
if(WIN32 AND NOT MSVC OR CYGWIN)
@@ -1579,7 +1595,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)
set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
@@ -1646,7 +1662,7 @@ endif(WIN32 OR CYGWIN)
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB)
- install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
+ install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
@@ -1682,7 +1698,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
endif(GCC_DLL AND STDC_DLL)
else(WIN32 AND NOT MSVC OR CYGWIN)
- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
+ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
endif(WIN32 AND NOT MSVC OR CYGWIN)
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
@@ -1746,7 +1762,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${OPT_TEXI}"
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}
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
index b7cd6ea..67f3f11 100644
--- a/Graphics/CMakeLists.txt
+++ b/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
drawGlyph.cpp
- gl2ps.cpp
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
diff --git a/debian/changelog b/debian/changelog
index 42cece2..52cf451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gmsh (2.11.0+dfsg1-1) unstable; urgency=medium
+
+ * [ca93886] Imported Upstream version 2.11.0+dfsg1
+ * [68a07dd] Refresh patches.
+ * [3acaa49] Update d/copyright.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 03 Jan 2016 11:02:18 +0100
+
gmsh (2.10.1+dfsg1-1) unstable; urgency=medium
* [4c450d1] Update d/watch.
diff --git a/wrappers/gmshpy/__init__.py.in b/wrappers/gmshpy/__init__.py.in
index ffdf1f7..5218de0 100644
--- a/wrappers/gmshpy/__init__.py.in
+++ b/wrappers/gmshpy/__init__.py.in
@@ -1,4 +1,7 @@
# set Ctrl-C to default signal (terminates immediately)
+from ctypes import *
+mpi = CDLL('libmpi.so.1', RTLD_GLOBAL)
+
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
${GMSH_PYTHON_OPENMPI_HACK}
diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt
index 4c8fbc6..6b5a29a 100644
--- a/wrappers/java/CMakeLists.txt
+++ b/wrappers/java/CMakeLists.txt
@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
if(UNIX)
- set_target_properties(WrapGmsh PROPERTIES PREFIX "lib")
+ set_target_properties(WrapGmsh PROPERTIES
+ PREFIX "lib"
+ OUTPUT_NAME java-gmsh
+ SOVERSION "${GMSH_MAJOR_VERSION}"
+ )
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
@@ -69,6 +73,6 @@ POST_BUILD # do the rest of the command after the build period
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
-install(TARGETS WrapGmsh DESTINATION lib OPTIONAL)
+install(TARGETS WrapGmsh DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list