4 files changed, 60 insertions, 14 deletions
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index f960329674f..4121a9579ec 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# 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
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 8e7fa0df891..ce5e54ac4f0 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/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
@@ -28,7 +28,15 @@ add_library(loadlib
   ${loadlib_sources}
 )
 
-target_link_libraries(loadlib zlib)
+if(NOT UNIX)
+  target_link_libraries(loadlib
+    zlib
+  )
+else()
+  target_link_libraries(loadlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 add_library(libmpq
   ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c
@@ -43,10 +51,18 @@ add_executable(mapextractor
   ${sources}
 )
 
-target_link_libraries(mapextractor
-  libmpq
-  loadlib
-  bzip2
-)
+if(WIN32)
+  target_link_libraries(mapextractor
+    libmpq
+    loadlib
+    bzip2
+  )
+else()
+  target_link_libraries(mapextractor
+    libmpq
+    loadlib
+    ${BZIP2_LIBRARIES}
+  )
+endif()
 
 install(TARGETS mapextractor DESTINATION bin)
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)
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 02d044cdaa9..c159c6fd715 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/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
@@ -9,9 +9,24 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+file(GLOB sources *.cpp)
+
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 
-add_executable(vmap3extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(vmap3extractor libmpq bzip2 zlib)
+add_executable(vmap3extractor ${sources})
+
+if(WIN32)
+  target_link_libraries(vmap3extractor
+    libmpq
+    bzip2
+    zlib
+  )
+else()
+  target_link_libraries(vmap3extractor
+    libmpq
+    ${BZIP2_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 install(TARGETS vmap3extractor DESTINATION bin)