summaryrefslogtreecommitdiffstats
path: root/Modules/Findosg.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-06-09 20:04:06 (GMT)
committerBrad King <brad.king@kitware.com>2008-06-09 20:04:06 (GMT)
commite2ec3b671b3753da42df167ba1a4e496d08b5ce2 (patch)
treefe2cea51ff2d1d1e681483a4bdad911fea88457c /Modules/Findosg.cmake
parent05434489079708e9896d03b7fc9153ded1d960b4 (diff)
downloadCMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.zip
CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.gz
CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.bz2
ENH: Cleanup Find* modules with new HINTS feature
- The find_* commands now provide a HINTS option. - The option specifies paths to be preferred over the system paths. - Many Find* modules were using two find calls with NO_DEFAULT_PATH to approximate the behavior, but that blocked users from overriding things with CMAKE_PREFIX_PATH. - This commit uses the HINTS feature to get desired behavior in only one find command call.
Diffstat (limited to 'Modules/Findosg.cmake')
-rw-r--r--Modules/Findosg.cmake17
1 files changed, 3 insertions, 14 deletions
diff --git a/Modules/Findosg.cmake b/Modules/Findosg.cmake
index 1a4598c..7804bae 100644
--- a/Modules/Findosg.cmake
+++ b/Modules/Findosg.cmake
@@ -27,14 +27,10 @@
# Try the user's environment request before anything else.
FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
- PATHS
+ HINTS
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -46,20 +42,14 @@ FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSG_LIBRARY
NAMES osg
- PATHS
+ HINTS
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSG_LIBRARY
- NAMES osg
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -69,7 +59,6 @@ FIND_LIBRARY(OSG_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSG_FOUND "NO")