From dd6c220fd705644faf8df71cded01492ff7af18a Mon Sep 17 00:00:00 2001 From: Christian Schmitt Date: Thu, 15 Nov 2012 15:47:01 +0100 Subject: [PATCH] CMAKE: find plib module: correct the linking order of the pu component, which has to be before fnt. This fixes the fgpanel linking on some distros. --- CMakeModules/FindPLIB.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeModules/FindPLIB.cmake b/CMakeModules/FindPLIB.cmake index da5463612..99d2780cf 100644 --- a/CMakeModules/FindPLIB.cmake +++ b/CMakeModules/FindPLIB.cmake @@ -132,7 +132,7 @@ if(${PLIB_LIBRARIES} STREQUAL "PLIB_LIBRARIES-NOTFOUND") if (${c} STREQUAL "pu") # handle MSVC confusion over pu/pui naming, by removing # 'pu' and then adding it back - list(REMOVE_ITEM outDeps "pu") + list(REMOVE_ITEM outDeps "pu" "fnt" "sg") list(APPEND outDeps ${PUNAME} "fnt" "sg") elseif (${c} STREQUAL "puaux") list(APPEND outDeps ${PUNAME} "fnt" "sg") @@ -144,7 +144,6 @@ if(${PLIB_LIBRARIES} STREQUAL "PLIB_LIBRARIES-NOTFOUND") list(APPEND outDeps "ul") # everything needs ul list(REMOVE_DUPLICATES outDeps) # clean up - # look for traditional static libraries foreach(component ${outDeps})