diff options
| author | Philip Lowman <philip@yhbt.com> | 2012-08-18 21:03:18 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2012-08-18 21:03:18 (GMT) |
| commit | dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac (patch) | |
| tree | 545c6a617961946c3e3a2b6b8d14a3692ea9654c /Modules/FindOpenThreads.cmake | |
| parent | 224b5dea785d20a9054a2b7fb9e737c106084879 (diff) | |
| parent | cfe4ac4b417b80fb657c8de3b43a29e12a558d82 (diff) | |
| download | CMake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.zip CMake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.tar.gz CMake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.tar.bz2 | |
Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
Resolved a few conflicts due to changes made in 13094 to paths
Conflicts:
Modules/FindOpenThreads.cmake
Modules/Findosg_functions.cmake
Diffstat (limited to 'Modules/FindOpenThreads.cmake')
| -rw-r--r-- | Modules/FindOpenThreads.cmake | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake index 7668107..e059960 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -58,13 +58,13 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread HINTS - $ENV{OPENTHREADS_INCLUDE_DIR} - $ENV{OPENTHREADS_DIR} - $ENV{OSG_INCLUDE_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - $ENV{OpenThreads_ROOT} - $ENV{OSG_ROOT} + ENV OPENTHREADS_INCLUDE_DIR + ENV OPENTHREADS_DIR + ENV OSG_INCLUDE_DIR + ENV OSG_DIR + ENV OSGDIR + ENV OpenThreads_ROOT + ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} PATHS @@ -80,13 +80,13 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread find_library(OPENTHREADS_LIBRARY NAMES OpenThreads OpenThreadsWin32 HINTS - $ENV{OPENTHREADS_LIBRARY_DIR} - $ENV{OPENTHREADS_DIR} - $ENV{OSG_LIBRARY_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - $ENV{OpenThreads_ROOT} - $ENV{OSG_ROOT} + ENV OPENTHREADS_LIBRARY_DIR + ENV OPENTHREADS_DIR + ENV OSG_LIBRARY_DIR + ENV OSG_DIR + ENV OSGDIR + ENV OpenThreads_ROOT + ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} PATHS @@ -95,20 +95,20 @@ find_library(OPENTHREADS_LIBRARY /opt/csw /opt /usr/freeware - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib ) find_library(OPENTHREADS_LIBRARY_DEBUG NAMES OpenThreadsd OpenThreadsWin32d HINTS - $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR} - $ENV{OPENTHREADS_LIBRARY_DIR} - $ENV{OPENTHREADS_DIR} - $ENV{OSG_LIBRARY_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - $ENV{OpenThreads_ROOT} - $ENV{OSG_ROOT} + ENV OPENTHREADS_DEBUG_LIBRARY_DIR + ENV OPENTHREADS_LIBRARY_DIR + ENV OPENTHREADS_DIR + ENV OSG_LIBRARY_DIR + ENV OSG_DIR + ENV OSGDIR + ENV OpenThreads_ROOT + ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} PATHS @@ -117,7 +117,7 @@ find_library(OPENTHREADS_LIBRARY_DEBUG /opt/csw /opt /usr/freeware - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib ) if(OPENTHREADS_LIBRARY_DEBUG) |