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.
This commit is contained in:
Brad King
2008-06-09 16:04:06 -04:00
parent 0543448907
commit e2ec3b671b
39 changed files with 132 additions and 531 deletions
+3 -14
View File
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
PATHS
HINTS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
NO_DEFAULT_PATH
PATH_SUFFIXES include
)
FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
/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(OSGFX_LIBRARY
NAMES osgFX
PATHS
HINTS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
)
FIND_LIBRARY(OSGFX_LIBRARY
NAMES osgFX
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGFX_LIBRARY
/opt/local
/opt/csw
/opt
PATH_SUFFIXES lib64 lib
)
SET(OSGFX_FOUND "NO")