From 50b7db982fa88e0b212cc46486b453ed1264c7e9 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sat, 10 Mar 2012 15:31:46 +0100 Subject: Fix zlib, protobuf. Zlib is now found using CMake on linux and set to harcoded paths on windows, yet uniform in use throughout the build system. protobuf-lite now compiles under MSVC properly. --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f37f7569..22961715 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,15 @@ IF(UNIX) SET(CMAKE_C_FLAGS "-fvisibility=hidden -m32 -march=i686 -mtune=generic") ENDIF() +# find and make available libz +if(NOT UNIX) + SET(ZLIB_INCLUDE_DIRS ${dfhack_SOURCE_DIR}/library/depends/zlib/include/) + SET(ZLIB_LIBRARIES ${dfhack_SOURCE_DIR}/library/depends/zlib/lib/zlib.lib) +else() + find_package(ZLIB REQUIRED) +endif() +include_directories(${ZLIB_INCLUDE_DIRS}) + #add depends to include path INCLUDE_DIRECTORIES ( library/depends ) INCLUDE_DIRECTORIES ( library/depends/protobuf/ ) -- cgit v1.2.1