Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client

Browse Source
hg/feature/sound
kervala 14 years ago
parent 247d77c3a4
commit 233fc51109
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
code/CMakeModules/CheckDepends.cmake
Unescape Escape View File

@ -68,7 +68,7 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
IF(OTOOL_LIBRARY MATCHES "${LIBNAME}") IF(OTOOL_LIBRARY MATCHES "${LIBNAME}")
SET(${LIBRARY_FOUND} TRUE) SET(${LIBRARY_FOUND} TRUE)
MESSAGE(STATUS "Library ${LIBNAME} already linked to ${${MYLIBRARY}}") MESSAGE(STATUS "Library ${LIBNAME} already linked to ${${MYLIBRARY}}")
ENDIF(NOT OTOOL_LIBRARY MATCHES "${LIBNAME}") ENDIF(OTOOL_LIBRARY MATCHES "${LIBNAME}")
ENDIF(CMAKE_OTOOL) ENDIF(CMAKE_OTOOL)
ELSEIF(UNIX) ELSEIF(UNIX)
IF(CMAKE_OBJDUMP) IF(CMAKE_OBJDUMP)
@ -76,9 +76,9 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
# TODO: under Solaris use dump -Lv <lib> # TODO: under Solaris use dump -Lv <lib>
# Use objdump to check if a library is linked to another library # Use objdump to check if a library is linked to another library
EXEC_PROGRAM(${CMAKE_OBJDUMP} ARGS "-p ${${MYLIBRARY}} | grep ${LIBNAME}" OUTPUT_VARIABLE OBJDUMP_LIBRARY) EXEC_PROGRAM(${CMAKE_OBJDUMP} ARGS "-p ${${MYLIBRARY}} | grep ${LIBNAME}" OUTPUT_VARIABLE OBJDUMP_LIBRARY)
IF(OBJDUMP_LIBRARY MATCHES "NEEDED") IF(NOT OBJDUMP_LIBRARY MATCHES "NEEDED")
SET(${LIBRARY_FOUND} TRUE) SET(${LIBRARY_FOUND} TRUE)
ENDIF(OBJDUMP_LIBRARY MATCHES "NEEDED") ENDIF(NOT OBJDUMP_LIBRARY MATCHES "NEEDED")
ENDIF(CMAKE_OBJDUMP) ENDIF(CMAKE_OBJDUMP)
ENDIF(WIN32) ENDIF(WIN32)
ENDMACRO(CHECK_LINKED_LIBRARY) ENDMACRO(CHECK_LINKED_LIBRARY)

Write Preview
Loading…
Cancel
Save