cmake: add ZLIB_INCLUDE_DIRS to include directories before external/u…

…nzip compile (fix compilation with msvc)
fumingxing2015 · Jan 26, 2015 · fc5023c · fc5023c
1 parent 567c593
commit fc5023c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -236,9 +236,11 @@ cocos_find_package(ZLIB ZLIB REQUIRED)
 # moreover our embedded version modified to quick provide
 # functionality needed by cocos.
 if(USE_PREBUILT_LIBS OR NOT MINGW)
+  #TODO: hack! should be in external/unzip/CMakeLists.txt
+  include_directories(${ZLIB_INCLUDE_DIRS})
   add_subdirectory(external/unzip)
-  set(MINIZIP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/unzip)
-  set(MINIZIP_LIBRARIES unzip)
+  set(MINIZIP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/unzip ${ZLIB_INCLUDE_DIRS})
+  set(MINIZIP_LIBRARIES unzip ${ZLIB_LIBRARIES})
   message(STATUS "MINIZIP include dirs: ${MINIZIP_INCLUDE_DIRS}")
 else()
   cocos_find_package(MINIZIP MINIZIP REQUIRED)