Precipitation updates from ThorstenR

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a98dd1f1471c10f076818220a46df2bb2e1b527..2a41c0b70a3ba5c5b88088bd33ab02f2b6331b60 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,6 +186,7 @@ endif()
 
 if(ENABLE_FGCOM)
   set(ENABLE_IAX 1)
+  include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
 endif()
 
 # Setup MSVC 3rd party directories
@@ -218,7 +219,16 @@ find_package(ZLIB    REQUIRED)
 find_package(Threads REQUIRED)
 find_package(OpenGL  REQUIRED)
 find_package(OpenAL  REQUIRED)
-find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
+find_package(OpenSceneGraph 3.2.0 REQUIRED
+  osgText
+  osgSim
+  osgDB
+  osgParticle
+  osgFX
+  osgUtil
+  osgViewer
+  osgGA
+)
 
 if (MSVC)
        find_package(CrashRpt)
@@ -333,13 +343,12 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
     ${OPENAL_INCLUDE_DIR}
-    ${SIMGEAR_INCLUDE_DIR}
+    ${SIMGEAR_INCLUDE_DIRS}
     ${PLIB_INCLUDE_DIR}
     ${SQLITE3_INCLUDED_DIR} )
 
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/src)
-include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
 # following is needed, because config.h is include 'bare', whereas
 # version.h is included as <Include/version.h> - this should be cleaned up
 include_directories(${PROJECT_BINARY_DIR}/src)