Various fixes and activated cmake in travis.

2015-10-08 23:08:09 +02:00
parent 075d950249
commit 797077c47b
5 changed files with 30 additions and 42 deletions
--- a/thirdparty/unzip/CMakeLists.txt
+++ b/thirdparty/unzip/CMakeLists.txt
@@ -5,10 +5,10 @@ SET(SOURCE
    miniunz.c
    unzip.c)

-include_directories(${ZLIB_INCLUDE_DIR} ${EXTRA_INCLUDES})
+include_directories(${ZLIB_INCLUDE_DIRS} ${EXTRA_INCLUDES})

 add_library(unzip ${SOURCE})
-target_link_libraries(unzip ${ZLIB_LIBRARY})
+target_link_libraries(unzip ${ZLIB_LIBRARIES})

 if(PSP OR UNIX)
 	set_target_properties(unzip PROPERTIES COMPILE_FLAGS "-Dunix")