Browse Source

Improving CMake to build the static version of assimp with the static version of zlib

Léo Terziman 12 years ago
parent
commit
647eab6ae9
1 changed files with 5 additions and 1 deletions
  1. 5 1
      CMakeLists.txt

+ 5 - 1
CMakeLists.txt

@@ -110,7 +110,11 @@ if( NOT ZLIB_FOUND )
   # compile from sources
   add_subdirectory(contrib/zlib)
   set(ZLIB_FOUND 1)
-  set(ZLIB_LIBRARIES zlib)
+  if( ASSIMP_BUILD_STATIC_LIB )
+    set(ZLIB_LIBRARIES zlibstatic)
+  else( ASSIMP_BUILD_STATIC_LIB )
+    set(ZLIB_LIBRARIES zlib)
+  endif( ASSIMP_BUILD_STATIC_LIB )
   set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib)
 else(NOT ZLIB_FOUND)
   ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB)