[tetgen] 01/01: Fix #737653

Christophe Trophime trophime-guest at moszumanska.debian.org
Mon Feb 10 12:10:39 UTC 2014


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

trophime-guest pushed a commit to branch master
in repository tetgen.

commit 0fa9519b70c210afe635b75d77b05e29ee99db5f
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Mon Feb 10 13:10:12 2014 +0100

    Fix #737653
---
 debian/patches/01_cmake.patch | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/patches/01_cmake.patch b/debian/patches/01_cmake.patch
index 59f31ea..1f4d33a 100644
--- a/debian/patches/01_cmake.patch
+++ b/debian/patches/01_cmake.patch
@@ -2,37 +2,42 @@ 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 @@
+Index: tetgen-1.5.0/CMakeLists.txt
+===================================================================
+--- tetgen-1.5.0.orig/CMakeLists.txt	2013-11-06 21:26:21.000000000 +0100
++++ tetgen-1.5.0/CMakeLists.txt	2014-02-10 13:04:27.951842671 +0100
+@@ -1,14 +1,28 @@
  # 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)
-+
+ 
+-#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)
 +INCLUDE(GNUInstallDirs)
+ 
 +
 +#Add a shared library to the project using the specified source files.
 +add_library(tetlib SHARED 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
++set_target_properties(tetlib PROPERTIES "COMPILE_DEFINITIONS" TETLIBRARY)
 +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
++# Add an executable to the project using the specified source files.
++add_executable(tetgen tetgen.cxx predicates.cxx)
++
 +# Install
 +install(TARGETS tetgen DESTINATION ${CMAKE_INSTALL_BINDIR})
 +install(TARGETS tetlib DESTINATION ${CMAKE_INSTALL_LIBDIR})

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



More information about the debian-science-commits mailing list