From: <hug...@li...> - 2010-09-26 20:33:22
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/3936a26214ba changeset: 4424:3936a26214ba user: Bruno Postle <br...@po...> date: Sun Sep 26 21:29:54 2010 +0100 description: Fix -lpthread fix diffstat: src/foreign/vigra/vigra_impex/CMakeLists.txt | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (16 lines): diff -r c8ed7735f41d -r 3936a26214ba src/foreign/vigra/vigra_impex/CMakeLists.txt --- a/src/foreign/vigra/vigra_impex/CMakeLists.txt Sun Sep 26 21:04:24 2010 +0100 +++ b/src/foreign/vigra/vigra_impex/CMakeLists.txt Sun Sep 26 21:29:54 2010 +0100 @@ -17,7 +17,10 @@ add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC} ${VIGRA_IMPEX_HEADER}) ENDIF (${HUGIN_SHARED_LIBS}) -SET(PTHREAD_LIB) FIND_LIBRARY(PTHREAD_LIB pthread) +IF(PTHREAD_LIB) + TARGET_LINK_LIBRARIES(huginvigraimpex ${PTHREAD_LIB} ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES}) +ELSE(PTHREAD_LIB) + TARGET_LINK_LIBRARIES(huginvigraimpex ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES}) +ENDIF(PTHREAD_LIB) -TARGET_LINK_LIBRARIES(huginvigraimpex ${PTHREAD_LIB} ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES}) |