fly/flightgear
1
0
Fork 0
Code Activity

cmake: Fix Xinerama and Xft dependency issue.

Browse source 
Don't try to add Xinerama/Xft libraries, unless these are installed.
It seems these libraries are also not required on all systems (not required
over here...).
This commit is contained in:
ThorstenB 2012-01-03 22:02:48 +01:00
parent dac00efbc7
commit 77640e0863
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -197,10 +197,20 @@ if(ENABLE_FGADMIN)
find_package(FLTK) find_package(FLTK)
if ( FLTK_FOUND ) if ( FLTK_FOUND )
if ( X11_Xinerama_FOUND )
message(STATUS "Found X11_Xinerama...")
list(APPEND FLTK_LIBRARIES ${COCOA_LIBRARY} ${X11_Xinerama_LIB})
endif()
if ( X11_Xft_FOUND )
message(STATUS "Found X11_Xft...")
list(APPEND FLTK_LIBRARIES ${COCOA_LIBRARY} ${X11_Xft_LIB})
endif()
set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} ) set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} )
set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xinerama_LIB} ${X11_Xft_LIB} ) set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} )
message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
endif ( FLTK_FOUND ) endif ( FLTK_FOUND )
endif(ENABLE_FGADMIN) endif(ENABLE_FGADMIN)

2
utils/fgadmin/src/CMakeLists.txt
View file

@ -10,8 +10,6 @@ target_link_libraries(fgadmin FGAdminUI
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${FLTK_LIBRARIES} ${FLTK_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${X11_Xinerama_LIB}
${X11_Xft_LIB}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
) )