mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client
This commit is contained in:
parent
697e3a723c
commit
81f1791fbe
1 changed files with 5 additions and 5 deletions
|
@ -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}")
|
||||||
|
|
Loading…
Reference in a new issue