From b81696a2a11d8d3fb730fa773b434ff5c5f183de Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 16 Sep 2010 17:23:52 +0200
Subject: [PATCH] Fixed: Some tools compilation

---
 code/nel/tools/3d/tile_edit_qt/CMakeLists.txt     |  5 +----
 code/nel/tools/misc/message_box_qt/CMakeLists.txt |  5 +----
 code/nel/tools/misc/words_dic_qt/CMakeLists.txt   |  5 +----
 code/ryzom/tools/CMakeLists.txt                   | 11 ++++++++---
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt
index 0ccfd8018..be955fd03 100644
--- a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt
+++ b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt
@@ -1,5 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/3d/tile_edit_qt/ )
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
 INCLUDE( ${QT_USE_FILE} )
 
 FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp)
@@ -13,8 +12,6 @@ QT4_WRAP_CPP( TILE_EDIT_MOC_SRCS ${TILE_EDIT_HDR})
 
 ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS})
 
-INCLUDE_DIRECTORIES(${QT_INCLUDES})
-
 TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
 NL_DEFAULT_PROPS(tile_edit_qt "Tools, 3D: Qt Tile Editor")
 NL_ADD_RUNTIME_FLAGS(tile_edit_qt)
diff --git a/code/nel/tools/misc/message_box_qt/CMakeLists.txt b/code/nel/tools/misc/message_box_qt/CMakeLists.txt
index f77fc3fd4..ebbf4fbb4 100644
--- a/code/nel/tools/misc/message_box_qt/CMakeLists.txt
+++ b/code/nel/tools/misc/message_box_qt/CMakeLists.txt
@@ -1,5 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/misc/message_box_qt/ )
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/misc/message_box_qt/ )
+INCLUDE_DIRECTORIES(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE( ${QT_USE_FILE} )
 
 FILE(GLOB MESSAGE_BOX_SRC *.cpp)
@@ -9,8 +8,6 @@ SET( QT_USE_QTXML TRUE)
 
 ADD_EXECUTABLE(message_box_qt ${MESSAGE_BOX_SRC})
 
-INCLUDE_DIRECTORIES(${QT_INCLUDES})
-
 TARGET_LINK_LIBRARIES(message_box_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
 NL_DEFAULT_PROPS(message_box_qt "Tools, Misc: Qt Message Box")
 
diff --git a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt b/code/nel/tools/misc/words_dic_qt/CMakeLists.txt
index ed8e51389..6c7e04156 100644
--- a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt
+++ b/code/nel/tools/misc/words_dic_qt/CMakeLists.txt
@@ -1,5 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/misc/words_dic_qt/ )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
+INCLUDE_DIRECTORIES(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE( ${QT_USE_FILE} )
 
 FILE(GLOB WORDS_DIC_SRC *.cpp)
@@ -22,8 +21,6 @@ QT4_WRAP_CPP( WORDS_DIC_MOC_SRCS ${WORDS_DIC_HDR})
 
 ADD_EXECUTABLE(words_dic_qt ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS} ${WORDS_DIC_RC})
 
-INCLUDE_DIRECTORIES(${QT_INCLUDES})
-
 TARGET_LINK_LIBRARIES(words_dic_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
 NL_DEFAULT_PROPS(words_dic_qt "Tools, Misc: Qt Words Dic")
 NL_ADD_RUNTIME_FLAGS(words_dic_qt)
diff --git a/code/ryzom/tools/CMakeLists.txt b/code/ryzom/tools/CMakeLists.txt
index d6d267841..247e75415 100644
--- a/code/ryzom/tools/CMakeLists.txt
+++ b/code/ryzom/tools/CMakeLists.txt
@@ -9,10 +9,15 @@ ADD_SUBDIRECTORY(leveldesign)
 ADD_SUBDIRECTORY(patch_gen)
 ADD_SUBDIRECTORY(pdr_util)
 ADD_SUBDIRECTORY(stats_scan)
-ADD_SUBDIRECTORY(sheets_packer) 
 
-ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(server)
+IF(WITH_RYZOM_CLIENT)
+  ADD_SUBDIRECTORY(sheets_packer) 
+  ADD_SUBDIRECTORY(client)
+ENDIF(WITH_RYZOM_CLIENT)
+
+IF(WITH_RYZOM_SERVER)
+  ADD_SUBDIRECTORY(server)
+ENDIF(WITH_RYZOM_SERVER)
 
 # Old stuff that doesn't compile anymore.
 #ADD_SUBDIRECTORY(occ2huff)