diff options
| author | Brad King <brad.king@kitware.com> | 2008-06-09 20:04:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-06-09 20:04:06 (GMT) |
| commit | e2ec3b671b3753da42df167ba1a4e496d08b5ce2 (patch) | |
| tree | fe2cea51ff2d1d1e681483a4bdad911fea88457c /Modules/FindQuickTime.cmake | |
| parent | 05434489079708e9896d03b7fc9153ded1d960b4 (diff) | |
| download | CMake-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/FindQuickTime.cmake')
| -rw-r--r-- | Modules/FindQuickTime.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Modules/FindQuickTime.cmake b/Modules/FindQuickTime.cmake index 00bc3ec..5a4a580 100644 --- a/Modules/FindQuickTime.cmake +++ b/Modules/FindQuickTime.cmake @@ -17,20 +17,15 @@ IF(APPLE) FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) ELSE(APPLE) FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h + HINTS $ENV{QUICKTIME_DIR}/include $ENV{QUICKTIME_DIR} - NO_DEFAULT_PATH ) - - FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h) - FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime + HINTS $ENV{QUICKTIME_DIR}/lib $ENV{QUICKTIME_DIR} - NO_DEFAULT_PATH ) - - FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) ENDIF(APPLE) SET(QUICKTIME_FOUND "NO") |