summaryrefslogtreecommitdiffstats
path: root/Modules/FindosgTerrain.cmake
diff options
context:
space:
mode:
authorPhilip Lowman <philip@yhbt.com>2009-01-19 18:33:36 (GMT)
committerPhilip Lowman <philip@yhbt.com>2009-01-19 18:33:36 (GMT)
commitd1640b11def5076223a87680adb6341b1dbd2c10 (patch)
tree558e9c82969d7aa589bd0cebbf2e11a45aa25358 /Modules/FindosgTerrain.cmake
parentd69e68609c29c14b3a88e2539d12940c04afb32b (diff)
downloadCMake-d1640b11def5076223a87680adb6341b1dbd2c10.zip
CMake-d1640b11def5076223a87680adb6341b1dbd2c10.tar.gz
CMake-d1640b11def5076223a87680adb6341b1dbd2c10.tar.bz2
BUG: Fixed Issue #7331 Bugs in Findosg*.cmake. Also added OPENTHREADS_LIBRARIES.
Diffstat (limited to 'Modules/FindosgTerrain.cmake')
-rw-r--r--Modules/FindosgTerrain.cmake58
1 files changed, 13 insertions, 45 deletions
diff --git a/Modules/FindosgTerrain.cmake b/Modules/FindosgTerrain.cmake
index 3f3a559..78bed7b 100644
--- a/Modules/FindosgTerrain.cmake
+++ b/Modules/FindosgTerrain.cmake
@@ -11,9 +11,13 @@
#
# Locate osgTerrain
# This module defines
-# OSGTERRAIN_LIBRARY
-# OSGTERRAIN_FOUND, if false, do not try to link to osgTerrain
-# OSGTERRAIN_INCLUDE_DIR, where to find the headers
+#
+# OSGTERRAIN_FOUND - Was osgTerrain found?
+# OSGTERRAIN_INCLUDE_DIR - Where to find the headers
+# OSGTERRAIN_LIBRARIES - The libraries to link for osgTerrain (use this)
+#
+# OSGTERRAIN_LIBRARY - The osgTerrain library
+# OSGTERRAIN_LIBRARY_DEBUG - The osgTerrain debug library
#
# $OSGDIR is an environment variable that would
# correspond to the ./configure --prefix=$OSGDIR
@@ -25,46 +29,10 @@
# #include <osg/PositionAttitudeTransform>
# #include <osgTerrain/Terrain>
-# Try the user's environment request before anything else.
-FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
- HINTS
- $ENV{OSGTERRAIN_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- PATH_SUFFIXES include
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
- /opt/csw # Blastwave
- /opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-)
-
-FIND_LIBRARY(OSGTERRAIN_LIBRARY
- NAMES osgTerrain
- HINTS
- $ENV{OSGTERRAIN_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- PATH_SUFFIXES lib64 lib
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
- /sw
- /opt/local
- /opt/csw
- /opt
-)
-
-SET(OSGTERRAIN_FOUND "NO")
-IF(OSGTERRAIN_LIBRARY AND OSGTERRAIN_INCLUDE_DIR)
- SET(OSGTERRAIN_FOUND "YES")
-ENDIF(OSGTERRAIN_LIBRARY AND OSGTERRAIN_INCLUDE_DIR)
+include(Findosg_functions)
+OSG_FIND_PATH (OSGTERRAIN osgTerrain/Terrain)
+OSG_FIND_LIBRARY(OSGTERRAIN osgTerrain)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGTERRAIN DEFAULT_MSG
+ OSGTERRAIN_LIBRARY OSGTERRAIN_INCLUDE_DIR)