FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too

Modules/FindOpenSceneGraph.cmake

@@ -26,6 +26,10 @@
 #    OSGDIR
 #    OSG_ROOT
 #
+# [CMake 2.8.10]:
+# The CMake variable OSG_DIR can now be used as well to influence detection, instead of needing
+# to specify an environment variable.
+#
 # This module defines the following output variables:
 #
 #    OPENSCENEGRAPH_FOUND - Was the OSG and all of the specified components found?
@@ -49,7 +53,7 @@
 
 #=============================================================================
 # Copyright 2009 Kitware, Inc.
-# Copyright 2009 Philip Lowman <[email protected]>
+# Copyright 2009-2012 Philip Lowman <[email protected]>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.

Modules/FindOpenThreads.cmake

@@ -15,10 +15,15 @@
 # correspond to the ./configure --prefix=$OPENTHREADS_DIR
 # used in building osg.
 #
+# [CMake 2.8.10]:
+# The CMake variables OPENTHREADS_DIR or OSG_DIR can now be used as well to influence
+# detection, instead of needing to specify an environment variable.
+#
 # Created by Eric Wing.
 
 #=============================================================================
 # Copyright 2007-2009 Kitware, Inc.
+# Copyright 2012 Philip Lowman <[email protected]>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -53,7 +58,6 @@
 
 find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
     HINTS
-        # enough environment variables?
         $ENV{OPENTHREADS_INCLUDE_DIR}
         $ENV{OPENTHREADS_DIR}
         $ENV{OSG_INCLUDE_DIR}
@@ -61,6 +65,8 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
         $ENV{OSGDIR}
         $ENV{OpenThreads_ROOT}
         $ENV{OSG_ROOT}
+        ${OPENTHREADS_DIR}
+        ${OSG_DIR}
     PATHS
         /sw # Fink
         /opt/local # DarwinPorts
@@ -81,6 +87,8 @@ find_library(OPENTHREADS_LIBRARY
         $ENV{OSGDIR}
         $ENV{OpenThreads_ROOT}
         $ENV{OSG_ROOT}
+        ${OPENTHREADS_DIR}
+        ${OSG_DIR}
     PATHS
         /sw
         /opt/local
@@ -101,6 +109,8 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
         $ENV{OSGDIR}
         $ENV{OpenThreads_ROOT}
         $ENV{OSG_ROOT}
+        ${OPENTHREADS_DIR}
+        ${OSG_DIR}
     PATHS
         /sw
         /opt/local

Modules/Findosg_functions.cmake

@@ -1,11 +1,12 @@
 #
 # This CMake file contains two macros to assist with searching for OSG
-# libraries and nodekits.
+# libraries and nodekits.  Please see FindOpenSceneGraph.cmake for full
+# documentation.
 #
 
 #=============================================================================
 # Copyright 2009 Kitware, Inc.
-# Copyright 2009 Philip Lowman <[email protected]>
+# Copyright 2009-2012 Philip Lowman <[email protected]>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -30,6 +31,8 @@ function(OSG_FIND_PATH module header)
             $ENV{OSG_DIR}
             $ENV{OSGDIR}
             $ENV{OSG_ROOT}
+            ${${module_uc}_DIR}
+            ${OSG_DIR}
        PATH_SUFFIXES include
        PATHS
             /sw # Fink
@@ -54,6 +57,8 @@ function(OSG_FIND_LIBRARY module library)
             $ENV{OSG_DIR}
             $ENV{OSGDIR}
             $ENV{OSG_ROOT}
+            ${${module_uc}_DIR}
+            ${OSG_DIR}
        PATH_SUFFIXES lib64 lib
        PATHS
             /sw # Fink
@@ -70,6 +75,8 @@ function(OSG_FIND_LIBRARY module library)
             $ENV{OSG_DIR}
             $ENV{OSGDIR}
             $ENV{OSG_ROOT}
+            ${${module_uc}_DIR}
+            ${OSG_DIR}
        PATH_SUFFIXES lib64 lib
        PATHS
             /sw # Fink