From 497cea4b1486113a22f7fa1c51803f3c6bde6e7e Mon Sep 17 00:00:00 2001
From: mattraykowski <devnull@localhost>
Date: Tue, 7 Sep 2010 14:30:12 -0600
Subject: [PATCH] Changed: #842 Cleaned up a couple tools to build correctly
 (especially when using STLport.)

---
 code/ryzom/client/src/seven_zip/CMakeLists.txt | 4 ++--
 code/ryzom/tools/assoc_mem/CMakeLists.txt      | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt
index 4c2d97307..fa9a1a4ea 100644
--- a/code/ryzom/client/src/seven_zip/CMakeLists.txt
+++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt
@@ -8,9 +8,10 @@ ADD_EXECUTABLE(7zDec ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS})
+NL_DEFAULT_PROPS(7zDec "Ryzom, Tools, Misc: Seven Zip Decoder")
+NL_ADD_RUNTIME_FLAGS(7zDec)
 
 NL_TARGET_LIB(ryzom_sevenzip ${LIB_SRC})
-
 TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS})
 NL_DEFAULT_PROPS(ryzom_sevenzip "Ryzom, Library: Seven Zip")
 NL_ADD_LIB_SUFFIX(ryzom_sevenzip)
@@ -18,5 +19,4 @@ NL_ADD_LIB_SUFFIX(ryzom_sevenzip)
 ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY)
 
 INSTALL(TARGETS ryzom_sevenzip LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
-
 INSTALL(TARGETS 7zDec RUNTIME DESTINATION bin COMPONENT client)
diff --git a/code/ryzom/tools/assoc_mem/CMakeLists.txt b/code/ryzom/tools/assoc_mem/CMakeLists.txt
index 61df5bf23..765a160e8 100644
--- a/code/ryzom/tools/assoc_mem/CMakeLists.txt
+++ b/code/ryzom/tools/assoc_mem/CMakeLists.txt
@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(assoc_mem ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(assoc_mem ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(assoc_mem ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(assoc_mem "Ryzom, Tools, Misc: assoc_mem")
+NL_ADD_RUNTIME_FLAGS(assoc_mem)
+
 INSTALL(TARGETS assoc_mem RUNTIME DESTINATION bin COMPONENT tools)