1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Description: The former patch sets default libraries, because of which several check options are ignored, hence
checking zlib after they have been set
Author: Nilesh Patra <nilesh@debian.org>
Forwarded: not-needed
Last-Update: 2021-08-25
--- hyphy.orig/CMakeLists.txt
+++ hyphy/CMakeLists.txt
@@ -362,15 +362,6 @@
add_definitions (-D__HYPHYCURL__)
endif(${CURL_FOUND})
-if(NOT NOZLIB)
- find_package(ZLIB 1.2.9)
- if(${ZLIB_FOUND})
- list(APPEND DEFAULT_LIBRARIES ${ZLIB_LIBRARIES})
- include_directories(${ZLIB_INCLUDE_DIRS})
- add_definitions (-D__ZLIB__)
- endif(${ZLIB_FOUND})
-endif(NOT NOZLIB)
-
@@ -426,6 +417,16 @@
set(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
endif()
+# Check for ZLIB after setting default libraries
+if(NOT NOZLIB)
+ find_package(ZLIB 1.2.9)
+ if(${ZLIB_FOUND})
+ list(APPEND DEFAULT_LIBRARIES ${ZLIB_LIBRARIES})
+ include_directories(${ZLIB_INCLUDE_DIRS})
+ add_definitions (-D__ZLIB__)
+ endif(${ZLIB_FOUND})
+endif(NOT NOZLIB)
+
#-------------------------------------------------------------------------------
# setup some source properties so that we don't spam stdout
#-------------------------------------------------------------------------------
|
