kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Added OSG_ROOT as supported env var (it's in the wild already). Cleaned

Browse Source 
up FindOpenThreads to support PATH_SUFFIXES.  Removed superfluous WIN32 registry
checks which should have been $ENV{} checks.
This commit is contained in:
Philip Lowman 2009-01-30 16:55:57 -05:00
parent 1569f5d0e4
commit 4b45824294
2 changed files with 47 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Modules/FindOpenThreads.cmake
View File

@ -40,25 +40,21 @@
find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS HINTS
# enough environment variables?
$ENV{OPENTHREADS_INCLUDE_DIR} $ENV{OPENTHREADS_INCLUDE_DIR}
$ENV{OPENTHREADS_DIR}/include
$ENV{OPENTHREADS_DIR} $ENV{OPENTHREADS_DIR}
$ENV{OSG_INCLUDE_DIR} $ENV{OSG_INCLUDE_DIR}
$ENV{OSG_DIR}/include
$ENV{OSG_DIR} $ENV{OSG_DIR}
$ENV{OSGDIR}/include
$ENV{OSGDIR} $ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
PATHS PATHS
~/Library/Frameworks /sw # Fink
/Library/Frameworks /opt/local # DarwinPorts
/usr/local/include /opt/csw # Blastwave
/usr/include /opt
/sw/include # Fink /usr/freeware
/opt/local/include # DarwinPorts PATH_SUFFIXES include
/opt/csw/include # Blastwave
/opt/include
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
) )
@ -66,33 +62,19 @@ find_library(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32 NAMES OpenThreads OpenThreadsWin32
HINTS HINTS
$ENV{OPENTHREADS_LIBRARY_DIR} $ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}/lib64
$ENV{OPENTHREADS_DIR}/lib
$ENV{OPENTHREADS_DIR} $ENV{OPENTHREADS_DIR}
$ENV{OSG_LIBRARY_DIR} $ENV{OSG_LIBRARY_DIR}
$ENV{OSG_DIR}/lib64
$ENV{OSG_DIR}/lib
$ENV{OSG_DIR} $ENV{OSG_DIR}
$ENV{OSGDIR}/lib64
$ENV{OSGDIR}/lib
$ENV{OSGDIR} $ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
PATHS PATHS
~/Library/Frameworks /sw
/Library/Frameworks /opt/local
/usr/local/lib64 /opt/csw
/usr/local/lib /opt
/usr/lib64 /usr/freeware
/usr/lib PATH_SUFFIXES lib64 lib
/sw/lib64
/sw/lib
/opt/local/lib64
/opt/local/lib
/opt/csw/lib64
/opt/csw/lib
/opt/lib64
/opt/lib
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
) )
find_library(OPENTHREADS_LIBRARY_DEBUG find_library(OPENTHREADS_LIBRARY_DEBUG
@ -100,31 +82,19 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
HINTS HINTS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR} $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
$ENV{OPENTHREADS_LIBRARY_DIR} $ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}/lib64
$ENV{OPENTHREADS_DIR}/lib
$ENV{OPENTHREADS_DIR} $ENV{OPENTHREADS_DIR}
$ENV{OSG_LIBRARY_DIR} $ENV{OSG_LIBRARY_DIR}
$ENV{OSG_DIR}/lib64
$ENV{OSG_DIR}/lib
$ENV{OSG_DIR} $ENV{OSG_DIR}
$ENV{OSGDIR}/lib64
$ENV{OSGDIR}/lib
$ENV{OSGDIR} $ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
PATHS PATHS
/usr/local/lib64 /sw
/usr/local/lib /opt/local
/usr/lib64 /opt/csw
/usr/lib /opt
/sw/lib64 /usr/freeware
/sw/lib PATH_SUFFIXES lib64 lib
/opt/local/lib64
/opt/local/lib
/opt/csw/lib64
/opt/csw/lib
/opt/lib64
/opt/lib
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
) )
if(OPENTHREADS_LIBRARY_DEBUG) if(OPENTHREADS_LIBRARY_DEBUG)
@ -132,7 +102,6 @@ if(OPENTHREADS_LIBRARY_DEBUG)
optimized ${OPENTHREADS_LIBRARY} optimized ${OPENTHREADS_LIBRARY}
debug ${OPENTHREADS_LIBRARY_DEBUG}) debug ${OPENTHREADS_LIBRARY_DEBUG})
else() else()
set(OPENTHREADS_LIBRARY_DEBUG ${OPENTHREADS_LIBRARY})
set(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY}) set(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY})
endif() endif()

22
Modules/Findosg_functions.cmake
View File

@ -15,16 +15,14 @@ function(OSG_FIND_PATH module header)
$ENV{${module_uc}_DIR} $ENV{${module_uc}_DIR}
$ENV{OSG_DIR} $ENV{OSG_DIR}
$ENV{OSGDIR} $ENV{OSGDIR}
$ENV{OSG_ROOT}
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
~/Library/Frameworks
/Library/Frameworks
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts
/opt/csw # Blastwave /opt/csw # Blastwave
/opt /opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] /usr/freeware
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
) )
endfunction(OSG_FIND_PATH module header) endfunction(OSG_FIND_PATH module header)
@ -41,17 +39,14 @@ function(OSG_FIND_LIBRARY module library)
$ENV{${module_uc}_DIR} $ENV{${module_uc}_DIR}
$ENV{OSG_DIR} $ENV{OSG_DIR}
$ENV{OSGDIR} $ENV{OSGDIR}
$ENV{OSG_ROOT}
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
PATHS PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts
/opt/csw # Blastwave /opt/csw # Blastwave
/opt /opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] /usr/freeware
) )
find_library(${module_uc}_LIBRARY_DEBUG find_library(${module_uc}_LIBRARY_DEBUG
@ -60,17 +55,14 @@ function(OSG_FIND_LIBRARY module library)
$ENV{${module_uc}_DIR} $ENV{${module_uc}_DIR}
$ENV{OSG_DIR} $ENV{OSG_DIR}
$ENV{OSGDIR} $ENV{OSGDIR}
$ENV{OSG_ROOT}
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
PATHS PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts
/opt/csw # Blastwave /opt/csw # Blastwave
/opt /opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] /usr/freeware
) )
if(NOT ${module_uc}_LIBRARY_DEBUG) if(NOT ${module_uc}_LIBRARY_DEBUG)
@ -85,8 +77,6 @@ function(OSG_FIND_LIBRARY module library)
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()
endfunction(OSG_FIND_LIBRARY module library) endfunction(OSG_FIND_LIBRARY module library)
# #