From 359ff4211c766324f907583f9674b2abf9e4b1cd Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Tue, 7 Sep 2010 14:30:12 -0600 Subject: [PATCH 1/3] 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) From 52483da28f7265347388f95dfc4642615fb540b2 Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Thu, 9 Sep 2010 06:40:07 -0600 Subject: [PATCH 2/3] Changed: #842 Correctly add found libwww libraries the the LIBWWW_LIBRARIES variable. --- code/CMakeModules/FindLibwww.cmake | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake index 8e50a5761..2b268a695 100644 --- a/code/CMakeModules/FindLibwww.cmake +++ b/code/CMakeModules/FindLibwww.cmake @@ -57,11 +57,17 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY) /opt/lib /usr/freeware/lib64 ) + + IF(${MYLIBRARY}) + SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}}) + ELSE(${MYLIBRARY}) + MESSAGE(STATUS "Libwww: Could not find: ${MYLIBRARY}") + ENDIF(${MYLIBRARY}) + ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY) # on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked" # we need to link them all manually - FIND_WWW_LIBRARY(LIBMD5_LIBRARY md5) FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp) FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache) @@ -83,13 +89,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 - ${LIBWWWAPP_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWHTML_LIBRARY} - ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} - ${LIBWWWSTREAM_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} -) - # Windows libwww version needs GNU Regex IF(WIN32) FIND_PATH(LIBWWW_REGEX_INCLUDE_DIR @@ -107,7 +106,7 @@ 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}) + #SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${LIBREGEX_LIBRARY}) ENDIF(LIBWWW_REGEX_INCLUDE_DIR) ELSE(WIN32) FIND_PACKAGE(EXPAT) From b4b9c37068747e9032c87a1cde0838a0db0a97ab Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Thu, 9 Sep 2010 06:44:01 -0600 Subject: [PATCH 3/3] merged FindLibwww.cmake --- code/CMakeModules/FindLibwww.cmake | 31 ++++++------------------------ 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake index 3dbaf1b17..422869b7d 100644 --- a/code/CMakeModules/FindLibwww.cmake +++ b/code/CMakeModules/FindLibwww.cmake @@ -57,6 +57,12 @@ 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 +89,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 +106,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)