From 72e4c5208fbe7f3dbd72de39c7d822149e1ec9a3 Mon Sep 17 00:00:00 2001 From: vl Date: Tue, 2 Nov 2010 17:16:50 +0100 Subject: [PATCH] Fixed: link order of the lib --- code/CMakeModules/FindLibwww.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake index b739e6c2f..9d5193e41 100644 --- a/code/CMakeModules/FindLibwww.cmake +++ b/code/CMakeModules/FindLibwww.cmake @@ -61,9 +61,9 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY OPTION) ) IF(${MYLIBRARY}) - IF(${OPTION} STREQUAL REQUIRED) + IF(${OPTION} STREQUAL REQUIRED OR WITH_STATIC) SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}}) - ENDIF(${OPTION} STREQUAL REQUIRED) + ENDIF(${OPTION} STREQUAL REQUIRED OR WITH_STATIC) ELSE(${MYIBRARY}) IF(NOT LIBWWW_FIND_QUIETLY) MESSAGE(STATUS "Warning: Libwww: Library not found: ${MYLIBRARY}") @@ -84,13 +84,15 @@ FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY REQUIRED wwwfile) # core trans utils html FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY REQUIRED wwwhtml) # core utils FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY REQUIRED wwwhttp) # md5 core mime stream utils FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY REQUIRED wwwmime) # core cache stream utils -FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY REQUIRED wwwtrans) # core utils -FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY REQUIRED wwwutils) # Required for static or if underlinking FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY OPTIONAL wwwcache) # core trans utils FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY OPTIONAL wwwstream) # core file utils +FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY REQUIRED wwwtrans) # core utils +FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY REQUIRED wwwutils) + + # Required only if underlinking # Unused protocols