Fix for old PUI versions

[flightgear.git] / CMakeModules / FindSimGear.cmake

diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index d673f8feb7b11fdd22d54399d6521f2f8ff25c47..47ce3ca30b2eba8228e729e2c29ebf2ed132b32e 100644 (file)
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -38,18 +38,14 @@ macro(find_sg_library libName varName libs)
       HINTS $ENV{SIMGEAR_DIR}
       PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} libs64 libs libs/Win32 libs/Win64
       PATHS
-      /usr/local
-      /usr
-      /opt
+      ${ADDITIONAL_LIBRARY_PATHS}
     )
     FIND_LIBRARY(${libVarName}_RELEASE
       NAMES ${libName}${CMAKE_RELEASE_POSTFIX}
       HINTS $ENV{SIMGEAR_DIR}
       PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} libs64 libs libs/Win32 libs/Win64
       PATHS
-      /usr/local
-      /usr
-      /opt
+      ${ADDITIONAL_LIBRARY_PATHS}
     )
     
    # message(STATUS "before: Simgear ${${libVarName}_RELEASE} ")
@@ -79,11 +75,7 @@ FIND_PATH(SIMGEAR_INCLUDE_DIR simgear/math/SGMath.hxx
   HINTS $ENV{SIMGEAR_DIR}
   PATH_SUFFIXES include
   PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /opt
+  ${ADDITIONAL_LIBRARY_PATHS}
 )
 
 # make sure the simgear include directory exists
@@ -132,7 +124,6 @@ if(SIMGEAR_SHARED)
 
     find_sg_library(SimGearCore SIMGEAR_CORE SIMGEAR_CORE_LIBRARIES)
     find_sg_library(SimGearScene SIMGEAR_SCENE SIMGEAR_LIBRARIES)
-
  
     list(APPEND SIMGEAR_LIBRARIES ${SIMGEAR_CORE_LIBRARIES})
     set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES "")
@@ -148,7 +139,6 @@ else(SIMGEAR_SHARED)
     
     find_sg_library(SimGearCore SIMGEAR_CORE SIMGEAR_CORE_LIBRARIES)
     find_sg_library(SimGearScene SIMGEAR_SCENE SIMGEAR_LIBRARIES)
-    find_sg_library(ShivaVG SIMGEAR_SCENE SIMGEAR_LIBRARIES)
 
     # again link order matters - scene libraries depend on core ones
     list(APPEND SIMGEAR_LIBRARIES ${SIMGEAR_CORE_LIBRARIES})