From 0eaa330817ed8922c114f2a764d3160d5c4c8209 Mon Sep 17 00:00:00 2001
From: 0u812 <0u812@users.noreply.github.com>
Date: Fri, 18 Mar 2016 10:59:56 -0700
Subject: [PATCH] find zlib and bz2 on non-windows because we now enable
 compression in libsbml

---
 CMakeLists.txt | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ce5603184..f300cfb4ab 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,16 +218,20 @@ if(WIN32)
   if(NOT ICONV_LIBRARY)
     message(SEND_ERROR "Could not find libiconv, required for libSBML linking")
   endif()
-  find_library(ZLIB_LIBRARY z zdll HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib)
-  if(NOT ZLIB_LIBRARY)
-    message(SEND_ERROR "Could not find zlib, required for libSBML linking")
-  endif()
-  find_library(BZ2_LIBRARY bz2 libbz2 HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib)
-  if(NOT BZ2_LIBRARY)
-    message(SEND_ERROR "Could not find libbz2, required for libSBML linking")
-  endif()
+endif()
+find_library(ZLIB_LIBRARY z zdll HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib)
+if(NOT ZLIB_LIBRARY)
+  message(SEND_ERROR "Could not find zlib, required for libSBML linking")
+endif()
+find_library(BZ2_LIBRARY bz2 libbz2 HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib)
+if(NOT BZ2_LIBRARY)
+  message(SEND_ERROR "Could not find libbz2, required for libSBML linking")
+endif()
 
+if(WIN32)
   set(LIBSBML_EXTRA_LIBS "${ICONV_LIBRARY};${ZLIB_LIBRARY};${BZ2_LIBRARY}" CACHE STRING "libSBML extra libraries")
+else()
+  set(LIBSBML_EXTRA_LIBS "${ZLIB_LIBRARY};${BZ2_LIBRARY}" CACHE STRING "libSBML extra libraries")
 endif()
 
 if (${BUILD_LLVM})