diff options
author | Rolf Eike Beer <eike@sf-mail.de> | 2012-03-29 00:00:54 +0200 |
---|---|---|
committer | Rolf Eike Beer <eike@sf-mail.de> | 2012-08-14 21:02:58 +0200 |
commit | b04650e163320353762b6ec196afa9500345b5cd (patch) | |
tree | 1790b38ae7db75f232a27f4aa796d4441c68f009 /Modules/Findosg_functions.cmake | |
parent | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (diff) | |
download | cmake-b04650e163320353762b6ec196afa9500345b5cd.tar.gz |
use the find_* functions ENV parameter
Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR.
This will make sure the paths will get correctly handled through different
platforms, especially on Windows.
Also fixes one place where paths with windows delimiters (\) were hardcoded to
use forward slashes.
Diffstat (limited to 'Modules/Findosg_functions.cmake')
-rw-r--r-- | Modules/Findosg_functions.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake index 30c08761c7..e9a777d545 100644 --- a/Modules/Findosg_functions.cmake +++ b/Modules/Findosg_functions.cmake @@ -26,10 +26,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 PATH_SUFFIXES include PATHS /sw # Fink @@ -50,10 +50,10 @@ 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 PATH_SUFFIXES lib64 lib PATHS /sw # Fink @@ -66,10 +66,10 @@ 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 PATH_SUFFIXES lib64 lib PATHS /sw # Fink |