[med-svn] [iqtree] 01/04: Patch from Gianfranco Costamagna <costamagnagianfranco at yahoo.it>

[Andreas Tille]

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

tille pushed a commit to branch master
in repository iqtree.

commit 2c65e622aacadde2940996f2d374bab22823ffd3
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 1 09:11:47 2015 +0200

    Patch from Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
---
 debian/patches/use_debian_packaged_libs.patch | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/patches/use_debian_packaged_libs.patch b/debian/patches/use_debian_packaged_libs.patch
index 49a80da..108f027 100644
--- a/debian/patches/use_debian_packaged_libs.patch
+++ b/debian/patches/use_debian_packaged_libs.patch
@@ -1,4 +1,5 @@
-Author: Andreas Tille <tille at debian.org>
+Author: Andreas Tille <tille at debian.org>,
+        Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 Last-Update: Mon, 31 Aug 2015 09:22:55 +0200
 Description: Use Debian packaged zlib and libeigen
 
@@ -12,24 +13,40 @@ Description: Use Debian packaged zlib and libeigen
  
  
  ##################################################################
-@@ -328,7 +327,6 @@ add_subdirectory(ncl)
+@@ -328,8 +327,11 @@ add_subdirectory(ncl)
  add_subdirectory(lbfgsb)
  add_subdirectory(whtest)
  add_subdirectory(sprng)
 -add_subdirectory(zlib-1.2.7)
  add_subdirectory(vectorclass)
++find_package(Eigen3)
++if(EIGEN3_FOUND)
++  include_directories(${EIGEN3_INCLUDE_DIR})
++endif(EIGEN3_FOUND)
  add_subdirectory(model)
  
-@@ -402,7 +400,7 @@ upperbounds.cpp
+ ##################################################################
+@@ -401,8 +403,18 @@ checkpoint.cpp
+ upperbounds.cpp
  )
  
++find_package(ZLIB)
++if(ZLIB_FOUND)
++  include_directories(${ZLIB_INCLUDE_DIRS})
++  target_link_libraries(iqtree ${ZLIB_LIBRARIES})
++else(ZLIB_FOUND)
++  include_directories("${PROJECT_BINARY_DIR}/zlib-1.2.7")
++  add_subdirectory(zlib-1.2.7)
++  target_link_libraries(iqtree zlibstatic)
++endif(ZLIB_FOUND)
++
  if (NOT IQTREE_FLAGS MATCHES "avx" AND NOT IQTREE_FLAGS MATCHES "fma")
 -	set_target_properties(iqtree pll ncl lbfgsb whtest zlibstatic sprng vectorclass model PROPERTIES COMPILE_FLAGS "${SSE_FLAGS}")
 +	set_target_properties(iqtree pll ncl lbfgsb whtest sprng vectorclass model PROPERTIES COMPILE_FLAGS "${SSE_FLAGS}")
  	if (NOT BINARY32 AND NOT IQTREE_FLAGS MATCHES "novx")
  		set_target_properties(avxkernel pllavx PROPERTIES COMPILE_FLAGS "${AVX_FLAGS}")
  	endif()
-@@ -436,9 +434,9 @@ if (IQTREE_FLAGS MATCHES "omp")
+@@ -436,9 +448,9 @@ if (IQTREE_FLAGS MATCHES "omp")
  endif()
  
  if (BINARY32 OR IQTREE_FLAGS MATCHES "novx")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/iqtree.git