fly/flightgear
1
0
Fork 0
Code Activity

: Properly set FLTK include directory.

Browse source
This commit is contained in:
ThorstenB 2012-03-12 21:15:05 +01:00
parent 25c6e8acbd
commit f453523b67
2 changed files with 2 additions and 3 deletions

3
CMakeLists.txt
View file

@ -209,9 +209,6 @@ if(ENABLE_FGADMIN)
list(APPEND FLTK_LIBRARIES ${X11_Xft_LIB}) list(APPEND FLTK_LIBRARIES ${X11_Xft_LIB})
endif() endif()
set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} )
set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} )
message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${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

@ -5,6 +5,8 @@ add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS})
add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c) add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
add_dependencies(fgadmin FGAdminUI) add_dependencies(fgadmin FGAdminUI)
include_directories(${FLTK_INCLUDE_DIR})
target_link_libraries(fgadmin FGAdminUI target_link_libraries(fgadmin FGAdminUI
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}