From 0db4f018e8df1a44d2657ca21e2e47038c1aab06 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Mon, 14 Mar 2016 15:45:39 +0100
Subject: CMake: Use inherited dependencies in common and tools

(cherry picked from commit abda7a910a760687f9c1b9e0893314e04982c0f1)
---
 src/tools/vmap4_assembler/CMakeLists.txt | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/tools/vmap4_assembler')

diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index b2b17f49289..28e8b374143 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -9,24 +9,17 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-include_directories(
-  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/src/common
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging
-  ${CMAKE_SOURCE_DIR}/src/common/Collision
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
-  ${ZLIB_INCLUDE_DIR}
-)
-
 add_executable(vmap4assembler VMapAssembler.cpp)
-add_dependencies(vmap4assembler casc)
 
 target_link_libraries(vmap4assembler
   common
-  g3dlib
-  ${ZLIB_LIBRARIES}
-)
+  casc
+  zlib)
+
+set_target_properties(vmap4assembler
+    PROPERTIES
+      FOLDER
+        "tools")
 
 if( UNIX )
   install(TARGETS vmap4assembler DESTINATION bin)
-- 
cgit v1.2.3