]> git.mxchange.org Git - flightgear.git/commitdiff
Fix shared library build with sqlite
authorThorstenB <brehmt@gmail.com>
Fri, 21 Sep 2012 20:32:07 +0000 (22:32 +0200)
committerThorstenB <brehmt@gmail.com>
Sat, 22 Sep 2012 12:23:14 +0000 (14:23 +0200)
Dependency to threading lib is required (It is already provided for
static SimGear).

CMakeLists.txt
src/Main/CMakeLists.txt

index 617d93d36a71304092c3b03d4a72f3e0f95e906b..47519337cc96ceebbd2c7b3c95615f103d4c98c5 100644 (file)
@@ -189,6 +189,9 @@ if (SYSTEM_SQLITE)
     message(STATUS "Using system SQLite3 library")
 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)
 
 # FlightGear and SimGear versions need to match
index d3fc203ae0064dfcd80d3de7a8db43b385f13163..8a8769cd3f9b0a55897d2cbd0ec153d70295852d 100644 (file)
@@ -92,13 +92,13 @@ include_directories(${PROJECT_SOURCE_DIR}/src/Canvas/ShivaVG/include)
 add_definitions(-DVG_API_EXPORT)
 
 target_link_libraries(fgfs
+       ${SQLITE3_LIBRARY}
        ${SIMGEAR_LIBRARIES}
        ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENGL_LIBRARIES}
        ${PLIB_LIBRARIES}
        ${JPEG_LIBRARY}
        ${HLA_LIBRARIES}
-    ${SQLITE3_LIBRARY}
        ${EVENT_INPUT_LIBRARIES}
        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
        ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}