diff options
| author | Philip Lowman <philip@yhbt.com> | 2012-08-18 17:03:18 -0400 |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2012-08-18 17:03:18 -0400 |
| commit | dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac (patch) | |
| tree | 545c6a617961946c3e3a2b6b8d14a3692ea9654c /Modules/Findosg_functions.cmake | |
| parent | 224b5dea785d20a9054a2b7fb9e737c106084879 (diff) | |
| parent | cfe4ac4b417b80fb657c8de3b43a29e12a558d82 (diff) | |
| download | cmake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.tar.gz | |
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/Findosg_functions.cmake')
| -rw-r--r-- | Modules/Findosg_functions.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake index e65e8581a3..2e908379f2 100644 --- a/Modules/Findosg_functions.cmake +++ b/Modules/Findosg_functions.cmake @@ -27,10 +27,10 @@ function(OSG_FIND_PATH module header) # Try the user's environment request before anything else. find_path(${module_uc}_INCLUDE_DIR ${header} HINTS - $ENV{${module_uc}_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - $ENV{OSG_ROOT} + ENV ${module_uc}_DIR + ENV OSG_DIR + ENV OSGDIR + ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} PATH_SUFFIXES include @@ -53,13 +53,13 @@ function(OSG_FIND_LIBRARY module library) find_library(${module_uc}_LIBRARY NAMES ${library} HINTS - $ENV{${module_uc}_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - $ENV{OSG_ROOT} + ENV ${module_uc}_DIR + ENV OSG_DIR + ENV OSGDIR + ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib PATHS /sw # Fink /opt/local # DarwinPorts @@ -71,13 +71,13 @@ function(OSG_FIND_LIBRARY module library) find_library(${module_uc}_LIBRARY_DEBUG NAMES ${library}d HINTS - $ENV{${module_uc}_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - $ENV{OSG_ROOT} + ENV ${module_uc}_DIR + ENV OSG_DIR + ENV OSGDIR + ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib PATHS /sw # Fink /opt/local # DarwinPorts |