diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-16 02:20:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-16 02:20:11 (GMT) |
| commit | 52718dbbf2539335e8a70b80497ad99b615cbe98 (patch) | |
| tree | 423c999dd7c84e2ad452a360acc91b6f881aa664 /Modules/FindOpenThreads.cmake | |
| parent | 80c2be45e0b1701406e3739bb8a0a8fcad949f69 (diff) | |
| download | CMake-52718dbbf2539335e8a70b80497ad99b615cbe98.zip CMake-52718dbbf2539335e8a70b80497ad99b615cbe98.tar.gz CMake-52718dbbf2539335e8a70b80497ad99b615cbe98.tar.bz2 | |
BUG: Remove references to CMAKE_PREFIX_PATH variable. It should not be referenced directly by FIND_* command calls. The commands search it automatically.
Diffstat (limited to 'Modules/FindOpenThreads.cmake')
| -rw-r--r-- | Modules/FindOpenThreads.cmake | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake index ffbad83..fc5cd36 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -37,10 +37,6 @@ # If nothing is found, then the second find will search the # standard install paths. # Explicit -DVAR=value arguments should still be able to override everything. -# Note: We have added an additional check for ${CMAKE_PREFIX_PATH}. -# This is not an official CMake variable, but one we are proposing be -# added to CMake. Be warned that this may go away or the variable name -# may change. FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread PATHS @@ -55,11 +51,7 @@ FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread NO_DEFAULT_PATH ) -FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES include -) + FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread ~/Library/Frameworks @@ -92,12 +84,7 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY NO_DEFAULT_PATH ) -FIND_LIBRARY(OPENTHREADS_LIBRARY - NAMES OpenThreads OpenThreadsWin32 - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) + FIND_LIBRARY(OPENTHREADS_LIBRARY NAMES OpenThreads OpenThreadsWin32 @@ -139,12 +126,7 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG NO_DEFAULT_PATH ) -FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG - NAMES OpenThreadsd OpenThreadsWin32d - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) + FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG NAMES OpenThreadsd OpenThreadsWin32d |