Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

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

Browse source
This commit is contained in:
kervala 2010-11-02 10:45:37 +01:00
parent 28321f4c66
commit 4441eb25c4
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/CMakeModules/CheckDepends.cmake
View file

@ -27,10 +27,10 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
ENDIF(CMAKE_OTOOL)
IF(CMAKE_NM)
# Use nm to check if a library is using an external symbol
EXEC_PROGRAM(${CMAKE_NM} ARGS "-Dgu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL)
IF(NOT NM_SYMBOL MATCHES ${SYMBOL})
EXEC_PROGRAM(${CMAKE_NM} ARGS "-gu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL)
IF(NOT NM_SYMBOL MATCHES " U ")
SET(${SYMBOL_FOUND} FALSE)
ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL})
ENDIF(NOT NM_SYMBOL MATCHES " U ")
ENDIF(CMAKE_NM)
ELSEIF(UNIX)
IF(CMAKE_OBJDUMP)
@ -61,8 +61,8 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
SET(CMAKE_OTOOL otool)
IF(CMAKE_OTOOL)
# Use otool to check if a library is linked to another library
GET_FILENAME_COMPONENT(LIBNAME ${${OTHERLIBRARY}} NAME)
EXEC_PROGRAM(${CMAKE_OTOOL} ARGS "-L ${${MYLIBRARY}} | grep ${${OTHERLIBRARY}}" OUTPUT_VARIABLE OTOOL_LIBRARY)
GET_FILENAME_COMPONENT(LIBNAME ${${OTHERLIBRARY}} NAME_WE)
EXEC_PROGRAM(${CMAKE_OTOOL} ARGS "-L ${${MYLIBRARY}} | grep ${LIBNAME}" OUTPUT_VARIABLE OTOOL_LIBRARY)
IF(NOT OTOOL_LIBRARY MATCHES "${LIBNAME}")
SET(${LIBRARY_FOUND} FALSE)
ENDIF(NOT OTOOL_LIBRARY MATCHES "${LIBNAME}")