Changed: Removed uneeded dependency to libxml and using new macros

code/nel/tools/3d/anim_builder/CMakeLists.txt

@@ -2,9 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(anim_builder ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(anim_builder ${PLATFORM_LINKFLAGS} nelmisc nel3d)
-TARGET_LINK_LIBRARIES(anim_builder ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
+NL_DEFAULT_PROPS(anim_builder "Tools, 3D: anim_builder")
-SET_TARGET_PROPERTIES(anim_builder PROPERTIES PROJECT_LABEL "Tools, 3D: anim_builder")
+NL_ADD_RUNTIME_FLAGS(anim_builder)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS anim_builder RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/animation_set_builder/CMakeLists.txt

@@ -2,9 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(animation_set_builder ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(animation_set_builder ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(animation_set_builder ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(animation_set_builder "Tools, 3D: anim_set_builder")
-SET_TARGET_PROPERTIES(animation_set_builder PROPERTIES PROJECT_LABEL "Tools, 3D: anim_set_builder")
+NL_ADD_RUNTIME_FLAGS(animation_set_builder)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS animation_set_builder RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_clod_bank/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(build_clod_bank ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_clod_bank ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(build_clod_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(build_clod_bank "Tools, 3D: build_clod_bank")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_clod_bank)
-  SET_TARGET_PROPERTIES(build_clod_bank PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_clod_bank")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_clod_bank RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_clodtex/CMakeLists.txt

@@ -2,15 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(build_clodtex ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_clodtex ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(build_clodtex ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(build_clodtex "Tools, 3D: build_clodtex")
-  
+NL_ADD_RUNTIME_FLAGS(build_clodtex)
-IF(WIN32)
-  SET_TARGET_PROPERTIES(build_clodtex PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_clodtex")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_clodtex RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_coarse_mesh ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(build_coarse_mesh ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(build_coarse_mesh "Tools, 3D: build_coarse_mesh")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_coarse_mesh)
-  SET_TARGET_PROPERTIES(build_coarse_mesh PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_coarse_mesh")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_coarse_mesh RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_far_bank/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(build_far_bank ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_far_bank ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(build_far_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(build_far_bank "Tools, 3D: build_far_bank")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_far_bank)
-  SET_TARGET_PROPERTIES(build_far_bank PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_far_bank")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_far_bank RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_interface/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(build_interface ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_interface ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(build_interface ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(build_interface "Tools, 3D: build_interface")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_interface)
-  SET_TARGET_PROPERTIES(build_interface PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_interface")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_interface RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_shadow_skin/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_shadow_skin ${PLATFORM_LINKFLAGS} nel3d)
-TARGET_LINK_LIBRARIES(build_shadow_skin ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(build_shadow_skin "Tools, 3D: build_shadow_skin")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_shadow_skin)
-  SET_TARGET_PROPERTIES(build_shadow_skin PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_shadow_skin")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_shadow_skin RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/build_smallbank/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(build_smallbank ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_smallbank ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(build_smallbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(build_smallbank "Tools, 3D: build_smallbank")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_smallbank)
-  SET_TARGET_PROPERTIES(build_smallbank PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: build_smallbank")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_smallbank RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/cluster_viewer/CMakeLists.txt

@@ -1,16 +1,9 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(cluster_viewer ${SRC})
+ADD_EXECUTABLE(cluster_viewer WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(cluster_viewer ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(cluster_viewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(cluster_viewer "Tools, 3D: Cluster Viewer")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(cluster_viewer)
-  SET_TARGET_PROPERTIES(cluster_viewer PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    LINK_FLAGS "/SUBSYSTEM:WINDOWS"
-    PROJECT_LABEL "Tools, 3D: Cluster Viewer")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS cluster_viewer RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/file_info/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(file_info ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(file_info ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(file_info ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(file_info "Tools, 3D: file_info")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(file_info)
-  SET_TARGET_PROPERTIES(file_info PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: file_info")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS file_info RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/get_neighbors/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(get_neighbors ${SRC})
 
-TARGET_LINK_LIBRARIES(get_neighbors ${PLATFORM_LINKFLAGS})
+TARGET_LINK_LIBRARIES(get_neighbors ${PLATFORM_LINKFLAGS} nelmisc)
 NL_DEFAULT_PROPS(get_neighbors "Tools, 3D: get_neighbors")
 NL_ADD_RUNTIME_FLAGS(get_neighbors)
 

code/nel/tools/3d/ig_add/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ig_add ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(ig_add ${PLATFORM_LINKFLAGS} nel3d)
-TARGET_LINK_LIBRARIES(ig_add ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(ig_add "Tools, 3D: ig_add")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(ig_add)
-  SET_TARGET_PROPERTIES(ig_add PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: ig_add")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS ig_add RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/ig_info/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ig_info ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(ig_info ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(ig_info ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(ig_info "Tools, 3D: ig_info")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(ig_info)
-  SET_TARGET_PROPERTIES(ig_info PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: ig_info")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS ig_info RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/ig_lighter/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
 
 ADD_EXECUTABLE(ig_lighter ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nel3d nelpacs)
-TARGET_LINK_LIBRARIES(ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d nelpacs)
+NL_DEFAULT_PROPS(ig_lighter "Tools, 3D: ig_lighter")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(ig_lighter)
-  SET_TARGET_PROPERTIES(ig_lighter PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: ig_lighter")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS ig_lighter RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/tga_cut/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(tga_cut ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(tga_cut ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(tga_cut ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(tga_cut "Tools, 3D: tga_cut")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(tga_cut)
-  SET_TARGET_PROPERTIES(tga_cut PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: tga_cut")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS tga_cut RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/tga_resize/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(tga_resize ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(tga_resize ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(tga_resize ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(tga_resize "Tools, 3D: tga_resize")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(tga_resize)
-  SET_TARGET_PROPERTIES(tga_resize PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: tga_resize")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS tga_resize RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/zone_check_bind/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(zone_check_bind ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(zone_check_bind ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(zone_check_bind ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(zone_check_bind "Tools, 3D: zone_check_bind")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(zone_check_bind)
-  SET_TARGET_PROPERTIES(zone_check_bind PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: zone_check_bind")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS zone_check_bind RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/zone_dependencies/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 
 ADD_EXECUTABLE(zone_dependencies ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(zone_dependencies ${PLATFORM_LINKFLAGS} nel3d nelgeorges nelmisc)
-TARGET_LINK_LIBRARIES(zone_dependencies ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d nelgeorges)
+NL_DEFAULT_PROPS(zone_dependencies "Tools, 3D: zone_dependencies")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(zone_dependencies)
-  SET_TARGET_PROPERTIES(zone_dependencies PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: zone_dependencies")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS zone_dependencies RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/zone_dump/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 
 ADD_EXECUTABLE(zone_dump ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(zone_dump ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(zone_dump ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(zone_dump "Tools, 3D: zone_dump")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(zone_dump)
-  SET_TARGET_PROPERTIES(zone_dump PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: zone_dump")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS zone_dump RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/zone_lighter/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 
 ADD_EXECUTABLE(zone_lighter ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(zone_lighter ${PLATFORM_LINKFLAGS} nel3d nelgeorges nelmisc)
-TARGET_LINK_LIBRARIES(zone_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d nelgeorges)
+NL_DEFAULT_PROPS(zone_lighter "Tools, 3D: zone_lighter")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(zone_lighter)
-  SET_TARGET_PROPERTIES(zone_lighter PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: zone_lighter")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS zone_lighter RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/zone_welder/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 
 ADD_EXECUTABLE(zone_welder ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(zone_welder ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-TARGET_LINK_LIBRARIES(zone_welder ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
+NL_DEFAULT_PROPS(zone_welder "Tools, 3D: zone_welder")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(zone_welder)
-  SET_TARGET_PROPERTIES(zone_welder PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: zone_welder")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS zone_welder RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/georges/georges2csv/CMakeLists.txt

@@ -3,13 +3,8 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(georges2csv ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(georges2csv ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nelgeorges)
+TARGET_LINK_LIBRARIES(georges2csv ${PLATFORM_LINKFLAGS} nelmisc nelgeorges)
-IF(WIN32)
+NL_DEFAULT_PROPS(georges2csv "Tools, Georges: georges2csv")
-  SET_TARGET_PROPERTIES(georges2csv PROPERTIES 
+NL_ADD_RUNTIME_FLAGS(georges2csv)
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, Georges: georges2csv")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS georges2csv RUNTIME DESTINATION bin COMPONENT toolsgeorges)

code/nel/tools/misc/bnp_make/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(bnp_make ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(bnp_make ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(bnp_make ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(bnp_make "Tools, Misc: bnp_make")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(bnp_make)
-  SET_TARGET_PROPERTIES(bnp_make PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, Misc: bnp_make")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS bnp_make RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/misc/disp_sheet_id/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(disp_sheet_id ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(disp_sheet_id ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(disp_sheet_id ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(disp_sheet_id "Tools, Misc: disp_sheet_id")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(disp_sheet_id)
-  SET_TARGET_PROPERTIES(disp_sheet_id PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, Misc: disp_sheet_id")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS disp_sheet_id RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/misc/make_sheet_id/CMakeLists.txt

@@ -4,15 +4,9 @@ ADD_EXECUTABLE(make_sheet_id ${SRC})
 
 ADD_DEFINITIONS(-DNL_MK_SH_ID_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(make_sheet_id ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(make_sheet_id ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(make_sheet_id "Tools, Misc: make_sheet_id")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(make_sheet_id)
-  SET_TARGET_PROPERTIES(make_sheet_id PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, Misc: make_sheet_id")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS make_sheet_id RUNTIME DESTINATION bin COMPONENT toolsmisc)
 INSTALL(FILES make_sheet_id.cfg DESTINATION etc/nel COMPONENT toolsmisc)

code/nel/tools/misc/xml_packer/CMakeLists.txt

@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(xml_packer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(xml_packer ${PLATFORM_LINKFLAGS} nelmisc)
-TARGET_LINK_LIBRARIES(xml_packer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(xml_packer "Tools, Misc: xml_packer")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(xml_packer)
-  SET_TARGET_PROPERTIES(xml_packer PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, Misc: xml_packer")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS xml_packer RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt

@@ -4,15 +4,9 @@ ADD_EXECUTABLE(build_ig_boxes ${SRC})
 
 ADD_DEFINITIONS(-DNL_BIB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_ig_boxes ${PLATFORM_LINKFLAGS} nelpacs nel3d)
-TARGET_LINK_LIBRARIES(build_ig_boxes ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelpacs nel3d)
+NL_DEFAULT_PROPS(build_ig_boxes "Tools, PACS: build_ig_boxes")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_ig_boxes)
-  SET_TARGET_PROPERTIES(build_ig_boxes PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, PACS: build_ig_boxes")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_ig_boxes RUNTIME DESTINATION bin COMPONENT toolspacs)
 INSTALL(FILES build_ig_boxes.cfg DESTINATION etc/nel COMPONENT toolspacs)

code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt

@@ -4,15 +4,9 @@ ADD_EXECUTABLE(build_indoor_rbank ${SRC})
 
 ADD_DEFINITIONS(-DNL_BIRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(build_indoor_rbank ${PLATFORM_LINKFLAGS} nelpacs)
-TARGET_LINK_LIBRARIES(build_indoor_rbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelpacs)
+NL_DEFAULT_PROPS(build_indoor_rbank "Tools, PACS: build_indoor_rbank")
-IF(WIN32)
+NL_ADD_RUNTIME_FLAGS(build_indoor_rbank)
-  SET_TARGET_PROPERTIES(build_indoor_rbank PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, PACS: build_indoor_rbank")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_indoor_rbank RUNTIME DESTINATION bin COMPONENT toolspacs)
 INSTALL(FILES build_indoor_rbank.cfg DESTINATION etc/nel COMPONENT toolspacs)

code/nel/tools/pacs/build_rbank/CMakeLists.txt

@@ -5,14 +5,10 @@ ADD_EXECUTABLE(build_rbank ${SRC})
 ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(build_rbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo)
+
-IF(WIN32)
+TARGET_LINK_LIBRARIES(build_rbank ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo nelmisc)
-  SET_TARGET_PROPERTIES(build_rbank PROPERTIES 
+NL_DEFAULT_PROPS(build_rbank "Tools, PACS: build_rbank")
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
+NL_ADD_RUNTIME_FLAGS(build_rbank)
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, PACS: build_rbank")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS build_rbank RUNTIME DESTINATION bin COMPONENT toolspacs)
 INSTALL(FILES build_rbank.cfg DESTINATION etc/nel COMPONENT toolspacs)