fly/flightgear
1
0
Fork 0
Code Activity

Fix shared library build with sqlite

Browse source 
Dependency to threading lib is required (It is already provided for
static SimGear).
This commit is contained in:
ThorstenB 2012-09-21 22:32:07 +02:00
parent 0f850312ea
commit acb7fb8e95
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -189,6 +189,9 @@ if (SYSTEM_SQLITE)
message(STATUS "Using system SQLite3 library") message(STATUS "Using system SQLite3 library")
endif (SYSTEM_SQLITE) endif (SYSTEM_SQLITE)
# Sqlite always depends on the threading lib
list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
find_package(PLIB REQUIRED puaux pu js fnt) find_package(PLIB REQUIRED puaux pu js fnt)
# FlightGear and SimGear versions need to match # FlightGear and SimGear versions need to match

2
src/Main/CMakeLists.txt
View file

@ -92,13 +92,13 @@ include_directories(${PROJECT_SOURCE_DIR}/src/Canvas/ShivaVG/include)
add_definitions(-DVG_API_EXPORT) add_definitions(-DVG_API_EXPORT)
target_link_libraries(fgfs target_link_libraries(fgfs
${SQLITE3_LIBRARY}
${SIMGEAR_LIBRARIES} ${SIMGEAR_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${HLA_LIBRARIES} ${HLA_LIBRARIES}
${SQLITE3_LIBRARY}
${EVENT_INPUT_LIBRARIES} ${EVENT_INPUT_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES} ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}