X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FCMakeLists.txt;h=096a800c6a19760f1b356e7eec869ddf76f87742;hb=ae0b8eb3b3943690d0788dde316b1c152390f1fd;hp=4f1de810c8835f68564c1978030e8fa5ce17709b;hpb=4b02335637243d2882ebf47aedde462bd6585a7f;p=simgear.git

diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index 4f1de810..096a800c 100644
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -45,39 +45,51 @@ if(SIMGEAR_SHARED)
     get_property(sceneSources GLOBAL PROPERTY SCENE_SOURCES)
     get_property(publicHeaders GLOBAL PROPERTY PUBLIC_HEADERS)
 
-    add_library(SimGear SHARED ${coreSources})
-  # set_property(TARGET SimGear PROPERTY FRAMEWORK 1)
+    add_library(SimGearCore SHARED ${coreSources})
+    set_property(TARGET SimGearCore PROPERTY COMPILE_FLAGS "-DNO_OPENSCENEGRAPH_INTERFACE=1")
+
+  # set_property(TARGET SimGearCore PROPERTY FRAMEWORK 1)
   #  message(STATUS "public header: ${publicHeaders}")
-    set_property(TARGET SimGear PROPERTY PUBLIC_HEADER "${publicHeaders}")
-    set_property(TARGET SimGear PROPERTY LINKER_LANGUAGE CXX)
-    
-    target_link_libraries(SimGear ${ZLIB_LIBRARY})					
-    install(TARGETS SimGear LIBRARY DESTINATION lib${LIB_SUFFIX}
-                               PUBLIC_HEADER DESTINATION include/simgear)
-                               
-	if(NOT SIMGEAR_HEADLESS)
-    	if(LIBSVN_FOUND)
-        	add_definitions(${APR_CFLAGS})
-
-        	IF(APPLE)
-        		set_property(SOURCE scene/tsync/terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
-        	ELSE()
-        		include_directories(${LIBSVN_INCLUDE_DIR})
-        	ENDIF(APPLE)
-        endif(LIBSVN_FOUND)
-    
-    	add_library(SimGearScene SHARED ${sceneSources})
+  #  set_property(TARGET SimGearCore PROPERTY PUBLIC_HEADER "${publicHeaders}")
+    set_property(TARGET SimGearCore PROPERTY LINKER_LANGUAGE CXX)
+
+    set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
+    set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
+
+    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
+    install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+    if(LIBSVN_FOUND)
+        add_definitions(${APR_CFLAGS})
+
+        IF(APPLE)
+            set_property(SOURCE scene/tsync/terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
+        ELSE()
+            include_directories(${LIBSVN_INCLUDE_DIR})
+        ENDIF(APPLE)
+        target_link_libraries(SimGearCore ${LIBSVN_LIBRARIES})
+    endif(LIBSVN_FOUND)
+
+    if(NOT SIMGEAR_HEADLESS)
+        list(APPEND sceneSources scene/util/SGCoreOSGDependant.cxx)
+
+        add_library(SimGearScene SHARED ${sceneSources})
       # set_property(TARGET SimGearScene PROPERTY FRAMEWORK 1)
       # set_property(TARGET SimGearScene PROPERTY PUBLIC_HEADER "${publicHeaders}")
         set_property(TARGET SimGearScene PROPERTY LINKER_LANGUAGE CXX)
-        
-        target_link_libraries(SimGearScene ${ZLIB_LIBRARY} 
-    			${OPENSCENEGRAPH_LIBRARIES} 
-    			${OPENAL_LIBRARY} ${ALUT_LIBRARY}
-    			${OPENGL_LIBRARY})
-    	
-    	install(TARGETS SimGearScene LIBRARY DESTINATION lib${LIB_SUFFIX})
+        set_property(TARGET SimGearScene PROPERTY VERSION   ${SIMGEAR_VERSION})
+        set_property(TARGET SimGearScene PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
+
+        target_link_libraries(SimGearScene
+            SimGearCore
+            ${ZLIB_LIBRARY}
+            ${OPENSCENEGRAPH_LIBRARIES}
+            ${OPENAL_LIBRARY} ${ALUT_LIBRARY}
+            ${OPENGL_LIBRARY}
+            ${JPEG_LIBRARY})
+    
+        install(TARGETS SimGearScene LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
-   
+
 endif(SIMGEAR_SHARED)
-    
+