From: Christian Schmitt <chris@ilovelinux.de>
Date: Thu, 15 Nov 2012 14:47:01 +0000 (+0100)
Subject: CMAKE: find plib module: correct the linking order of the pu component,
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dd6c220fd705644faf8df71cded01492ff7af18a;p=flightgear.git

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.
---

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})