find zlib and bz2 on non-windows because we now enable compression in…

… libsbml
sys-bio · Mar 18, 2016 · 0eaa330 · 0eaa330
1 parent 3ba1d1e
commit 0eaa330
Showing 1 changed file with 12 additions and 8 deletions.
diff --git 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})