From 1c96f52568d680e320b58874df31caabae536f4c Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Mon, 21 Jun 2010 07:17:26 +0200
Subject: Add more CMake-related support for building g3dlib, zlib, bzip2, ace
 on Windows

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/CMakeLists.txt | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/tools/vmap3_assembler')

diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 4b86c1ffa16..0b8ece2dc37 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,16 +10,31 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
-  ${ACE_INCLUDE_DIR}
 )
 
 add_definitions(-DNO_CORE_FUNCS)
+
 add_executable(vmap3assembler VMapAssembler.cpp)
-target_link_libraries(vmap3assembler collision g3dlib)
+
+if(WIN32)
+  target_link_libraries(vmap3assembler
+    collision
+    g3dlib
+    zlib
+  )
+else()
+  target_link_libraries(vmap3assembler
+    collision
+    g3dlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 install(TARGETS vmap3assembler DESTINATION bin)
-- 
cgit v1.2.3