]> git.mxchange.org Git - flightgear.git/commitdiff
CMAKE: find plib module: correct the linking order of the pu component,
authorChristian Schmitt <chris@ilovelinux.de>
Thu, 15 Nov 2012 14:47:01 +0000 (15:47 +0100)
committerChristian Schmitt <chris@ilovelinux.de>
Thu, 15 Nov 2012 14:48:34 +0000 (15:48 +0100)
which has to be before fnt. This fixes the fgpanel linking on some distros.

CMakeModules/FindPLIB.cmake

index da5463612aaf72eb7dec88449058e8195979a2fb..99d2780cfc7396b17029b3b29b9d4c8ede276f45 100644 (file)
@@ -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})