summaryrefslogtreecommitdiffstats
path: root/Modules/Findosg_functions.cmake
diff options
context:
space:
mode:
authorPhilip Lowman <philip@yhbt.com>2009-01-30 21:55:57 (GMT)
committerPhilip Lowman <philip@yhbt.com>2009-01-30 21:55:57 (GMT)
commit4b45824294258d91ba9cc8d9bf9d0b9310dbf1fa (patch)
tree81e875097291444b24098f2295ad499f08d483cc /Modules/Findosg_functions.cmake
parent1569f5d0e46e7f763326b8e0e9f6529e3a0247d6 (diff)
downloadCMake-4b45824294258d91ba9cc8d9bf9d0b9310dbf1fa.zip
CMake-4b45824294258d91ba9cc8d9bf9d0b9310dbf1fa.tar.gz
CMake-4b45824294258d91ba9cc8d9bf9d0b9310dbf1fa.tar.bz2
ENH: Added OSG_ROOT as supported env var (it's in the wild already). Cleaned
up FindOpenThreads to support PATH_SUFFIXES. Removed superfluous WIN32 registry checks which should have been $ENV{} checks.
Diffstat (limited to 'Modules/Findosg_functions.cmake')
-rw-r--r--Modules/Findosg_functions.cmake22
1 files changed, 6 insertions, 16 deletions
diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake
index 65ad03d..6991136 100644
--- a/Modules/Findosg_functions.cmake
+++ b/Modules/Findosg_functions.cmake
@@ -15,16 +15,14 @@ function(OSG_FIND_PATH module header)
$ENV{${module_uc}_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
+ $ENV{OSG_ROOT}
PATH_SUFFIXES include
PATHS
- ~/Library/Frameworks
- /Library/Frameworks
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
+ /usr/freeware
)
endfunction(OSG_FIND_PATH module header)
@@ -41,17 +39,14 @@ function(OSG_FIND_LIBRARY module library)
$ENV{${module_uc}_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
+ $ENV{OSG_ROOT}
PATH_SUFFIXES lib64 lib
PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
+ /usr/freeware
)
find_library(${module_uc}_LIBRARY_DEBUG
@@ -60,17 +55,14 @@ function(OSG_FIND_LIBRARY module library)
$ENV{${module_uc}_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
+ $ENV{OSG_ROOT}
PATH_SUFFIXES lib64 lib
PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
+ /usr/freeware
)
if(NOT ${module_uc}_LIBRARY_DEBUG)
@@ -85,8 +77,6 @@ function(OSG_FIND_LIBRARY module library)
PARENT_SCOPE
)
endif()
-
-
endfunction(OSG_FIND_LIBRARY module library)
#