fly/flightgear
1
0
Fork 0
Code Activity

Try to fix cmake build for fgpanel without GLUT

Browse source
This commit is contained in:
Torsten Dreyer 2011-07-21 23:42:45 +02:00
parent 8f0f67f668
commit dcde3a9350
2 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -66,12 +66,6 @@ else()
set(FG_NDEBUG 1) set(FG_NDEBUG 1)
endif() endif()
if(WITH_FGPANEL)
message(STATUS "Will build fgpanel")
else()
message(STATUS "Will NOT build fgpanel")
endif()
if(SP_FDMS) if(SP_FDMS)
set(ENABLE_SP_FDM 1) set(ENABLE_SP_FDM 1)
endif() endif()

11
utils/fgpanel/CMakeLists.txt
View file

@ -2,8 +2,10 @@
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLUT REQUIRED) find_package(GLUT REQUIRED)
if(GLUT_FOUND)
message(STATUS "found glut")
add_executable(fgpanel main.cxx add_executable(fgpanel main.cxx
FGGLApplication.cxx FGGLApplication.cxx
FGPanelApplication.cxx FGPanelApplication.cxx
FGPNGTextureLoader.cxx FGPNGTextureLoader.cxx
@ -13,7 +15,7 @@ add_executable(fgpanel main.cxx
panel.cxx panel.cxx
panel_io.cxx) panel_io.cxx)
target_link_libraries(fgpanel target_link_libraries(fgpanel
-lrt -lrt
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${GLUT_LIBRARIES} ${GLUT_LIBRARIES}
@ -23,4 +25,7 @@ target_link_libraries(fgpanel
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
) )
install(TARGETS fgpanel RUNTIME DESTINATION bin) install(TARGETS fgpanel RUNTIME DESTINATION bin)
else()
message(STATUS "glut NOT found, can't build fgpanel")
endif()