]> git.mxchange.org Git - simgear.git/commitdiff
Move JPEG dependency
authorThorstenB <brehmt@gmail.com>
Sun, 29 Jan 2012 13:39:48 +0000 (14:39 +0100)
committerThorstenB <brehmt@gmail.com>
Sun, 29 Jan 2012 13:39:48 +0000 (14:39 +0100)
Alas, JPEG_FACTORY is in SimGearScene, not SimGearCore...

simgear/CMakeLists.txt

index a7ac393275fb66313e5707792fb6b08171d15a76..684e2eee8e0ec24b2e6428d05a34e56f4468afb4 100644 (file)
@@ -56,7 +56,7 @@ if(SIMGEAR_SHARED)
     set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
     set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
 
-    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY} ${JPEG_LIBRARY})
+    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
     install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
     if(NOT SIMGEAR_HEADLESS)
@@ -84,7 +84,8 @@ if(SIMGEAR_SHARED)
             ${ZLIB_LIBRARY} 
             ${OPENSCENEGRAPH_LIBRARIES} 
             ${OPENAL_LIBRARY} ${ALUT_LIBRARY}
-            ${OPENGL_LIBRARY})
+            ${OPENGL_LIBRARY}
+            ${JPEG_LIBRARY})
     
         if(LIBSVN_FOUND)
             target_link_libraries(SimGearScene ${LIBSVN_LIBRARIES})