Try to fix cmake build for fgpanel without GLUT
This commit is contained in:
parent
8f0f67f668
commit
dcde3a9350
2 changed files with 24 additions and 25 deletions
|
@ -66,12 +66,6 @@ else()
|
|||
set(FG_NDEBUG 1)
|
||||
endif()
|
||||
|
||||
if(WITH_FGPANEL)
|
||||
message(STATUS "Will build fgpanel")
|
||||
else()
|
||||
message(STATUS "Will NOT build fgpanel")
|
||||
endif()
|
||||
|
||||
if(SP_FDMS)
|
||||
set(ENABLE_SP_FDM 1)
|
||||
endif()
|
||||
|
|
|
@ -2,25 +2,30 @@
|
|||
find_package(PNG REQUIRED)
|
||||
find_package(OpenGL REQUIRED)
|
||||
find_package(GLUT REQUIRED)
|
||||
if(GLUT_FOUND)
|
||||
message(STATUS "found glut")
|
||||
|
||||
add_executable(fgpanel main.cxx
|
||||
FGGLApplication.cxx
|
||||
FGPanelApplication.cxx
|
||||
FGPNGTextureLoader.cxx
|
||||
FGRGBTextureLoader.cxx
|
||||
FGPanelProtocol.cxx
|
||||
FGFontCache.cxx
|
||||
panel.cxx
|
||||
panel_io.cxx)
|
||||
add_executable(fgpanel main.cxx
|
||||
FGGLApplication.cxx
|
||||
FGPanelApplication.cxx
|
||||
FGPNGTextureLoader.cxx
|
||||
FGRGBTextureLoader.cxx
|
||||
FGPanelProtocol.cxx
|
||||
FGFontCache.cxx
|
||||
panel.cxx
|
||||
panel_io.cxx)
|
||||
|
||||
target_link_libraries(fgpanel
|
||||
-lrt
|
||||
${PNG_LIBRARIES}
|
||||
${GLUT_LIBRARIES}
|
||||
${SIMGEAR_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
${PLIB_LIBRARIES}
|
||||
)
|
||||
target_link_libraries(fgpanel
|
||||
-lrt
|
||||
${PNG_LIBRARIES}
|
||||
${GLUT_LIBRARIES}
|
||||
${SIMGEAR_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
${ZLIB_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()
|
||||
|
|
Loading…
Reference in a new issue