merge

code/CMakeModules/FindLibwww.cmake

@@ -57,6 +57,13 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY)
     /opt/lib
     /usr/freeware/lib64
   )
+  
+  IF(${MYLIBRARY})
+    SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}})
+  ELSE(${MYLIBRARY})
+    MESSAGE(STATUS "Warning: Libwww: Library not found: ${MYLIBRARY}")
+  ENDIF(${MYLIBRARY})
+  
 ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
 
 # on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked"
@@ -83,30 +90,6 @@ FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
 FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml)
 FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip)
 
-# combine all the libraries into one variable
-SET(LIBWWW_LIBRARIES
-  ${LIBMD5_LIBRARY}
-  ${LIBWWWAPP_LIBRARY}
-  ${LIBWWWCACHE_LIBRARY}
-  ${LIBWWWCORE_LIBRARY}
-  ${LIBWWWDIR_LIBRARY}
-  ${LIBWWWFILE_LIBRARY}
-  ${LIBWWWFTP_LIBRARY}
-  ${LIBWWWGOPHER_LIBRARY}
-  ${LIBWWWHTML_LIBRARY}
-  ${LIBWWWHTTP_LIBRARY}
-  ${LIBWWWINIT_LIBRARY}
-  ${LIBWWWMIME_LIBRARY}
-  ${LIBWWWMUX_LIBRARY}
-  ${LIBWWWNEWS_LIBRARY}
-  ${LIBWWWSTREAM_LIBRARY}
-  ${LIBWWWTELNET_LIBRARY}
-  ${LIBWWWTRANS_LIBRARY}
-  ${LIBWWWUTILS_LIBRARY}
-  ${LIBWWWXML_LIBRARY}
-  ${LIBWWWZIP_LIBRARY}
-)
-
 # Windows libwww version needs GNU Regex
 IF(WIN32)
   FIND_PATH(LIBWWW_REGEX_INCLUDE_DIR
@@ -124,7 +107,6 @@ IF(WIN32)
   IF(LIBWWW_REGEX_INCLUDE_DIR)
     SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_REGEX_INCLUDE_DIR})
     FIND_WWW_LIBRARY(LIBREGEX_LIBRARY gnu_regex)
-    SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${LIBREGEX_LIBRARY})
   ENDIF(LIBWWW_REGEX_INCLUDE_DIR)
 ELSE(WIN32)
   FIND_PACKAGE(EXPAT)

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)

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})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(assoc_mem ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+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)