#706: Properly set FLTK include directory.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1952d7c86ee47ab9aab2e5fddf8da6d3690abba4..cf6424068cfe04bfe931d3f25383cbdaeba28c58 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,9 +209,6 @@ if(ENABLE_FGADMIN)
                        list(APPEND FLTK_LIBRARIES ${X11_Xft_LIB})
                endif()
 
-               set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} )
-               set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} )
-
                message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
        endif ( FLTK_FOUND )
 endif(ENABLE_FGADMIN)

diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt
index 222a4c62f625b4f4f6e96ac636382e25b8232935..42b95d7998f3109dea39e0dcc4e08bf656507b44 100644 (file)
--- a/utils/fgadmin/src/CMakeLists.txt
+++ b/utils/fgadmin/src/CMakeLists.txt
@@ -5,6 +5,8 @@ add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS})
 add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
 add_dependencies(fgadmin FGAdminUI)
 
+include_directories(${FLTK_INCLUDE_DIR})
+
 target_link_libraries(fgadmin FGAdminUI
        ${SIMGEAR_CORE_LIBRARIES}
        ${PLIB_LIBRARIES}