Fixes for headless mode.

[simgear.git] / simgear / CMakeLists.txt

diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index 3f6f03c59b80e1f3a67e778e3b957912b6483a6a..e3ff31ef63a21c168794974da76717b035855440 100644 (file)
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -23,14 +23,18 @@ foreach( mylibfolder
 
 endforeach( mylibfolder )
 
-if (NOT SIMGEAR_HEADLESS)
+if(NOT SIMGEAR_HEADLESS)
     add_subdirectory(environment)
     add_subdirectory(screen)
     add_subdirectory(scene)
     add_subdirectory(sound)
-endif()
+endif(NOT SIMGEAR_HEADLESS)
 
 
+if(ENABLE_RTI)
+    add_subdirectory(hla)
+endif(ENABLE_RTI)
+
 
 set(HEADERS compiler.h constants.h sg_inlines.h ${PROJECT_BINARY_DIR}/simgear/version.h)
 install (FILES ${HEADERS}  DESTINATION include/simgear/)
@@ -38,18 +42,20 @@ install (FILES ${HEADERS}  DESTINATION include/simgear/)
 if(SIMGEAR_SHARED)
     message(STATUS "building shared library")
     get_property(allSources GLOBAL PROPERTY ALL_SOURCES)
-       get_property(publicHeaders GLOBAL PROPERTY PUBLIC_HEADERS)
+    get_property(publicHeaders GLOBAL PROPERTY PUBLIC_HEADERS)
 
     add_library(SimGear SHARED ${allSources})
     set_property(TARGET SimGear PROPERTY FRAMEWORK 1)
-       message(STATUS "public header: ${publicHeaders}")
-       set_property(TARGET SimGear PROPERTY PUBLIC_HEADER "${publicHeaders}")
+    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} 
                        ${OPENSCENEGRAPH_LIBRARIES} 
                        ${OPENAL_LIBRARY} ${ALUT_LIBRARY}
                        ${OPENGL_LIBRARY})
                        
-       install()
+    install(TARGETS SimGear LIBRARY DESTINATION lib${LIB_SUFFIX}
+                            PUBLIC_HEADER DESTINATION include/simgear)
 endif(SIMGEAR_SHARED)
-    
\ No newline at end of file
+