From f453523b6720b5c70fde985de0c84e2a84834c59 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Mon, 12 Mar 2012 21:15:05 +0100 Subject: [PATCH] #706: Properly set FLTK include directory. --- CMakeLists.txt | 3 --- utils/fgadmin/src/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1952d7c86..cf6424068 100644 --- 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 222a4c62f..42b95d799 100644 --- 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} -- 2.39.5