[tetgen] 09/15: Update cmake-patch.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository tetgen.

commit df7578c4fcc22f751cc9f2e7bb8a216b21dd16ba
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Jan 28 22:41:04 2014 +0100

    Update cmake-patch.
---
 debian/patches/01_cmake.patch | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/cmake.patch    | 43 -------------------------------------------
 debian/patches/series         |  2 +-
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/debian/patches/01_cmake.patch b/debian/patches/01_cmake.patch
new file mode 100644
index 0000000..59f31ea
--- /dev/null
+++ b/debian/patches/01_cmake.patch
@@ -0,0 +1,39 @@
+Description: update CMakeLists.txt
+Author: Anton Gladky <gladk at debian.org>, Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Last-Update: 2014-01-28
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,14 +1,23 @@
+ # Set  the minimum  required version  of cmake  for a  project.
+ cmake_minimum_required(VERSION 2.6)
+ 
++set(TET_MAJOR_VERSION 1)
++set(TET_MINOR_VERSION 5)
++set(TET_PATCH_VERSION 0)
++
++INCLUDE(GNUInstallDirs)
++
++#Add a shared library to the project using the specified source files.
++add_library(tetlib SHARED tetgen.cxx predicates.cxx)
++set_target_properties(tetlib PROPERTIES OUTPUT_NAME tet)
++set_target_properties(tetlib PROPERTIES
++    VERSION ${TET_MAJOR_VERSION}.${TET_MINOR_VERSION}.${TET_PATCH_VERSION}
++    SOVERSION ${TET_MAJOR_VERSION}.${TET_MINOR_VERSION})
++
+ # Add an executable to the project using the specified source files.
+ add_executable(tetgen tetgen.cxx predicates.cxx)
+ 
+-#Add a library to the project using the specified source files. 
+-# In Linux/Unix, it will creates the libtet.a
+-add_library(tet STATIC tetgen.cxx predicates.cxx)
+-
+-#Set properties on a target. 
+-#We use this here to set -DTETLIBRARY for when compiling the
+-#library
+-set_target_properties(tet PROPERTIES "COMPILE_DEFINITIONS" TETLIBRARY)
+\ No newline at end of file
++# Install
++install(TARGETS tetgen DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS tetlib DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES tetgen.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/debian/patches/cmake.patch b/debian/patches/cmake.patch
deleted file mode 100644
index 85e6b0f..0000000
--- a/debian/patches/cmake.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: tetgen-1.5.0/CMakeLists.txt
-===================================================================
---- tetgen-1.5.0.orig/CMakeLists.txt	2014-01-21 17:34:41.425844628 +0100
-+++ tetgen-1.5.0/CMakeLists.txt	2014-01-21 18:04:11.959439851 +0100
-@@ -1,8 +1,13 @@
- # Set  the minimum  required version  of cmake  for a  project.
- cmake_minimum_required(VERSION 2.6)
- 
--# Add an executable to the project using the specified source files.
--add_executable(tetgen tetgen.cxx predicates.cxx)
-+set(TET_MAJOR_VERSION 1)
-+set(TET_MINOR_VERSION 5)
-+set(TET_PATCH_VERSION 0)
-+
-+set(TETGEN_BIN bin)
-+set(TETGEN_LIB lib)
-+set(TETGEN_INCLUDE include)
- 
- #Add a library to the project using the specified source files. 
- # In Linux/Unix, it will creates the libtet.a
-@@ -11,4 +16,20 @@
- #Set properties on a target. 
- #We use this here to set -DTETLIBRARY for when compiling the
- #library
--set_target_properties(tet PROPERTIES "COMPILE_DEFINITIONS" TETLIBRARY)
-\ No newline at end of file
-+set_target_properties(tet PROPERTIES "COMPILE_DEFINITIONS" TETLIBRARY)
-+
-+#Add a shared library to the project using the specified source files.
-+add_library(shared SHARED tetgen.cxx predicates.cxx)
-+set_target_properties(shared PROPERTIES OUTPUT_NAME tet)
-+set_target_properties(shared PROPERTIES
-+    VERSION ${TET_MAJOR_VERSION}.${TET_MINOR_VERSION}.${TET_PATCH_VERSION}
-+    SOVERSION ${TET_MAJOR_VERSION}.${TET_MINOR_VERSION})
-+
-+# Add an executable to the project using the specified source files.
-+add_executable(tetgen tetgen.cxx predicates.cxx)
-+
-+# Install
-+install(TARGETS tetgen DESTINATION ${TETGEN_BIN} OPTIONAL)
-+install(TARGETS tet DESTINATION ${TETGEN_LIB} OPTIONAL)
-+install(TARGETS shared DESTINATION ${TETGEN_LIB} OPTIONAL)
-+install(FILES tetgen.h DESTINATION ${TETGEN_INCLUDE} OPTIONAL)
diff --git a/debian/patches/series b/debian/patches/series
index 09ee5a3..86dd546 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-cmake.patch
+01_cmake.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tetgen.git