Browse Source

Fixed lib flag error.

QGC4.4
James Goppert 14 years ago
parent
commit
f2590b9a72
  1. 7
      CMakeLists.txt

7
CMakeLists.txt

@ -184,6 +184,7 @@ set(qgroundcontrolIncludes
lib/QMapControl lib/QMapControl
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
) )
set (qgroundcontrolLibs)
# dependency summary # dependency summary
message(STATUS "=======================================") message(STATUS "=======================================")
@ -200,30 +201,35 @@ endif (MAVLINK_FOUND)
if (OPENSCENEGRAPH_FOUND) if (OPENSCENEGRAPH_FOUND)
message(STATUS "\t\tOpenSceneGraph\tYES") message(STATUS "\t\tOpenSceneGraph\tYES")
list(APPEND qgroundcontrolIncludes ${OPENSCENEGRAPH_INCLUDE_DIRS}) list(APPEND qgroundcontrolIncludes ${OPENSCENEGRAPH_INCLUDE_DIRS})
list(APPEND qgroundcontrolLibs ${SDL_LIBRARY})
else() else()
message(STATUS "\t\tOpenSceneGraph\t\tNO") message(STATUS "\t\tOpenSceneGraph\t\tNO")
endif (OPENSCENEGRAPH_FOUND) endif (OPENSCENEGRAPH_FOUND)
if (QT4_FOUND) if (QT4_FOUND)
message(STATUS "\t\tQT4\t\tYES") message(STATUS "\t\tQT4\t\tYES")
list(APPEND qgroundcontrolIncludes ${QT_INCLUDE_DIRS}) list(APPEND qgroundcontrolIncludes ${QT_INCLUDE_DIRS})
list(APPEND qgroundcontrolLibs ${QT_LIBRARIES})
else() else()
message(STATUS "\t\tQT4\t\tNO") message(STATUS "\t\tQT4\t\tNO")
endif (QT4_FOUND) endif (QT4_FOUND)
if (PHONON_FOUND) if (PHONON_FOUND)
message(STATUS "\t\tPHONON\t\tYES") message(STATUS "\t\tPHONON\t\tYES")
list(APPEND qgroundcontrolIncludes ${PHONON_INCLUDE_DIR}/phonon) list(APPEND qgroundcontrolIncludes ${PHONON_INCLUDE_DIR}/phonon)
list(APPEND qgroundcontrolLibs ${PHONON_LIBS})
else() else()
message(STATUS "\t\tPHONON\t\tNO") message(STATUS "\t\tPHONON\t\tNO")
endif (PHONON_FOUND) endif (PHONON_FOUND)
if (SDL_FOUND) if (SDL_FOUND)
message(STATUS "\t\tSDL\t\tYES") message(STATUS "\t\tSDL\t\tYES")
list(APPEND qgroundcontrolIncludes ${SDL_INCLUDE_DIR}) list(APPEND qgroundcontrolIncludes ${SDL_INCLUDE_DIR})
list(APPEND qgroundcontrolLibs ${SDL_LIBRARY})
else() else()
message(STATUS "\t\tSDL\t\tNO") message(STATUS "\t\tSDL\t\tNO")
endif (SDL_FOUND) endif (SDL_FOUND)
if (OPENGL_FOUND) if (OPENGL_FOUND)
message(STATUS "\t\tOPENGL\t\tYES") message(STATUS "\t\tOPENGL\t\tYES")
list(APPEND qgroundcontrolIncludes ${OPENGL_INCLUDE_DIR}) list(APPEND qgroundcontrolIncludes ${OPENGL_INCLUDE_DIR})
list(APPEND qgroundcontrolLibs ${OPENGL_LIBRARIES})
else() else()
message(STATUS "\t\tOPENGL\t\tNO") message(STATUS "\t\tOPENGL\t\tNO")
endif (OPENGL_FOUND) endif (OPENGL_FOUND)
@ -233,6 +239,7 @@ if (UNIX)
if (FLITE_FOUND) if (FLITE_FOUND)
message(STATUS "\t\tFLITE\t\tYES") message(STATUS "\t\tFLITE\t\tYES")
list(APPEND qgroundcontrolIncludes ${FLITE_INCLUDE_DIR}) list(APPEND qgroundcontrolIncludes ${FLITE_INCLUDE_DIR})
list(APPEND qgroundcontrolLibs ${FLITE_LIBRARIES})
else() else()
message(STATUS "\t\tFLITE\t\tNO") message(STATUS "\t\tFLITE\t\tNO")
endif (FLITE_FOUND) endif (FLITE_FOUND)

Loading…
Cancel
Save