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 12:51:35 +01:00
parent c95c01ce4d
commit 17634a3303
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/CMakeModules/CheckDepends.cmake
View file

@ -6,7 +6,7 @@
# #
# Syntax: # Syntax:
# CHECK_UNDEFINED_SYMBOL(MYLIBRARY SYMBOL SYMBOL_FOUND) # CHECK_UNDEFINED_SYMBOL(MYLIBRARY SYMBOL SYMBOL_FOUND)
# SYMBOL_FOUND will be set to TRUE or FALSE # SYMBOL_FOUND will be set to TRUE if UNDEFINED
# #
# Example: # Example:
# CHECK_UNDEFINED_SYMBOL(PNG_LIBRARY inflate INFLATE_FOUND) # CHECK_UNDEFINED_SYMBOL(PNG_LIBRARY inflate INFLATE_FOUND)
@ -16,21 +16,14 @@ 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_NM nm) SET(CMAKE_NM nm)
IF(CMAKE_OTOOL)
# 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)
IF(NOT OTOOL_SYMBOL MATCHES "undefined")
SET(${SYMBOL_FOUND} FALSE)
ENDIF(NOT OTOOL_SYMBOL MATCHES "undefined")
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 "-gu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL) EXEC_PROGRAM(${CMAKE_NM} ARGS "-gu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL)
MESSAGE(STATUS "Checking for undefined symbol ${SYMBOL} in ${${MYLIBRARY}}")
IF(NOT NM_SYMBOL MATCHES ${SYMBOL}) IF(NOT NM_SYMBOL MATCHES ${SYMBOL})
SET(${SYMBOL_FOUND} FALSE) SET(${SYMBOL_FOUND} FALSE)
MESSAGE(STATUS "Undefined symbol ${SYMBOL} detected in ${${MYLIBRARY}}") MESSAGE(STATUS "Defined symbol ${SYMBOL} detected in ${${MYLIBRARY}}")
ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL}) ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL})
ENDIF(CMAKE_NM) ENDIF(CMAKE_NM)
ELSEIF(UNIX) ELSEIF(UNIX)
@ -49,7 +42,7 @@ ENDMACRO(CHECK_UNDEFINED_SYMBOL)
# #
# Syntax: # Syntax:
# CHECK_LINKED_LIBRARY(MYLIBRARY OTHERLIBRARY LIBRARY_FOUND) # CHECK_LINKED_LIBRARY(MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
# LIBRARY_FOUND will be set to TRUE or FALSE # LIBRARY_FOUND will be set to TRUE if LINKED
# #
# Example: # Example:
# CHECK_LINKED_LIBRARY(PNG_LIBRARY ZLIB_LIBRARY ZLIB_FOUND) # CHECK_LINKED_LIBRARY(PNG_LIBRARY ZLIB_LIBRARY ZLIB_FOUND)