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-10-31 22:15:49 +01:00
parent 1b4205b277
commit cc0eb26a77
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/CMakeModules/CheckDepends.cmake
View file

@ -16,7 +16,8 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
IF(WIN32) IF(WIN32)
# Always TRUE under Windows because we are using static libraries # Always TRUE under Windows because we are using static libraries
ELSEIF(APPLE) ELSEIF(APPLE)
SET(CMAKE_OTOOL otool) # SET(CMAKE_OTOOL otool)
SET(CMAKE_NM nm)
IF(CMAKE_OTOOL) IF(CMAKE_OTOOL)
# Use otool to check if a library is using an external symbol # Use otool to check if a library is using an external symbol
EXEC_PROGRAM(${CMAKE_OTOOL} ARGS "-Rv ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE OTOOL_SYMBOL) EXEC_PROGRAM(${CMAKE_OTOOL} ARGS "-Rv ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE OTOOL_SYMBOL)
@ -24,6 +25,13 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
SET(${SYMBOL_FOUND} FALSE) SET(${SYMBOL_FOUND} FALSE)
ENDIF(NOT OTOOL_SYMBOL MATCHES "undefined") ENDIF(NOT OTOOL_SYMBOL MATCHES "undefined")
ENDIF(CMAKE_OTOOL) ENDIF(CMAKE_OTOOL)
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)
IF(NOT NM_SYMBOL MATCHES ${SYMBOL})
SET(${SYMBOL_FOUND} FALSE)
ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL})
ENDIF(CMAKE_NM)
ELSEIF(UNIX) ELSEIF(UNIX)
IF(CMAKE_OBJDUMP) IF(CMAKE_OBJDUMP)
# Use objdump to check if a library is using an external symbol # Use objdump to check if a library is using an external symbol