fly/flightgear
1
0
Fork 0
Code Activity

CMAKE: find plib module: correct the linking order of the pu component,

Browse source 
which has to be before fnt. This fixes the fgpanel linking on some distros.
This commit is contained in:
Christian Schmitt 2012-11-15 15:47:01 +01:00
parent 779a9ae415
commit dd6c220fd7
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeModules/FindPLIB.cmake
View 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})