aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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