From df7805acc5a4463af44aaa3b840be02a24498926 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 2 Nov 2010 13:04:10 +0100 Subject: [PATCH] Fixed: #1152 FindLibwww does not make all needed libs link to ryzom_client --- code/CMakeModules/CheckDepends.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/CMakeModules/CheckDepends.cmake b/code/CMakeModules/CheckDepends.cmake index 8a1fa1aee..e9a186354 100644 --- a/code/CMakeModules/CheckDepends.cmake +++ b/code/CMakeModules/CheckDepends.cmake @@ -20,10 +20,10 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND) IF(CMAKE_NM) # Use nm to check if a library is using an external symbol EXEC_PROGRAM(${CMAKE_NM} ARGS "-gu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL) - MESSAGE(STATUS "Checking for undefined symbol ${SYMBOL} in ${${MYLIBRARY}}") +# MESSAGE(STATUS "Checking for undefined symbol ${SYMBOL} in ${${MYLIBRARY}}") IF(NOT NM_SYMBOL MATCHES ${SYMBOL}) SET(${SYMBOL_FOUND} FALSE) - MESSAGE(STATUS "Defined symbol ${SYMBOL} detected in ${${MYLIBRARY}}") +# MESSAGE(STATUS "Defined symbol ${SYMBOL} detected in ${${MYLIBRARY}}") ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL}) ENDIF(CMAKE_NM) ELSEIF(UNIX) @@ -57,10 +57,10 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND) # Use otool to check if a library is linked to another library GET_FILENAME_COMPONENT(LIBNAME ${${OTHERLIBRARY}} NAME_WE) EXEC_PROGRAM(${CMAKE_OTOOL} ARGS "-L ${${MYLIBRARY}} | grep ${LIBNAME}" OUTPUT_VARIABLE OTOOL_LIBRARY) - MESSAGE(STATUS "Checking if ${LIBNAME} is linked to ${${MYLIBRARY}}") +# MESSAGE(STATUS "Checking if ${LIBNAME} is linked to ${${MYLIBRARY}}") IF(OTOOL_LIBRARY MATCHES "${LIBNAME}") SET(${LIBRARY_FOUND} TRUE) - MESSAGE(STATUS "Library ${LIBNAME} already linked to ${${MYLIBRARY}}") +# MESSAGE(STATUS "Library ${LIBNAME} already linked to ${${MYLIBRARY}}") ENDIF(OTOOL_LIBRARY MATCHES "${LIBNAME}") ENDIF(CMAKE_OTOOL) ELSEIF(UNIX) @@ -122,8 +122,6 @@ MACRO(LINK_DEPENDS LIBRARIES MYLIBRARY OTHERLIBRARY SYMBOL) IF(MUST_LINK) MESSAGE(STATUS "Linking with ${${OTHERLIBRARY}}") SET(${LIBRARIES} ${${LIBRARIES}} ${${OTHERLIBRARY}}) + SET(${OTHERLIBRARY}_LINKED TRUE) ENDIF(MUST_LINK) -# IF(LIBRARY_FOUND) -# SET(${OTHERLIBRARY}_LINKED TRUE) -# ENDIF(LIBRARY_FOUND) -ENDMACRO(LINK_DEPENDS) + NDMACRO(LINK_DEPENDS)