From Eric Wing, "Attached are a few Find modules with updates. Among other things, they
contain better support for environmental variables to pre-empt the autodection default search path order which is very helpful for people who do automated builds. (I recommend that the remaining modules consider adding the same system to make things consistent and easier for those people that want to do the automated builds.) The CMAKE_PREFIX_PATH has also been added to help people. I don't recommend adding this to the other modules because it looks like CMake agreed with my idea and will be adding the support in 2.6. So when that ships, people will get it for free. (In the meantime, my modules that do have it, it can be used.) Finally, I've submitted all of these modules to official CMake plus more so they will be in the next version of CMake. It looks like I may need to sort some compatibility issues out with the KDE people who seem to have conflicting modules, but this is unrelated to the updates submitted here as OSG already has these conflicts. I figured I would just sync OSG up with my current/best versions. Also of note, I added the large batch of Findosg*.cmake modules to CMake so people building against OpenSceneGraph can use these without writing their own. I wasn't sure if I should submit them here or not since they are for building against OSG and not for building OSG itself. So they are not included. "
This commit is contained in:
Robert Osfield
@@ -43,36 +43,36 @@
|
||||
# may change.
|
||||
|
||||
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
|
||||
PATHS
|
||||
$ENV{OPENTHREADS_INCLUDE_DIR}
|
||||
$ENV{OPENTHREADS_DIR}/include
|
||||
$ENV{OPENTHREADS_DIR}
|
||||
$ENV{OSG_INCLUDE_DIR}
|
||||
$ENV{OSG_DIR}/include
|
||||
$ENV{OSG_DIR}
|
||||
$ENV{OSGDIR}/include
|
||||
$ENV{OSGDIR}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
IF(NOT OPENTHREADS_INCLUDE_DIR)
|
||||
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
|
||||
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
||||
PATH_SUFFIXES include
|
||||
)
|
||||
ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
|
||||
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
|
||||
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES include
|
||||
)
|
||||
|
||||
IF(NOT OPENTHREADS_INCLUDE_DIR)
|
||||
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include # Fink
|
||||
/opt/local/include # DarwinPorts
|
||||
/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
|
||||
)
|
||||
ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
|
||||
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include # Fink
|
||||
/opt/local/include # DarwinPorts
|
||||
/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
|
||||
)
|
||||
|
||||
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY
|
||||
@@ -86,39 +86,39 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
|
||||
$ENV{OSG_DIR}/lib64
|
||||
$ENV{OSG_DIR}/lib
|
||||
$ENV{OSG_DIR}
|
||||
$ENV{OSGDIR}/lib64
|
||||
$ENV{OSGDIR}/lib
|
||||
$ENV{OSGDIR}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
IF(NOT OPENTHREADS_LIBRARY)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY
|
||||
NAMES OpenThreads OpenThreadsWin32
|
||||
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
||||
PATH_SUFFIXES lib64 lib
|
||||
)
|
||||
ENDIF(NOT OPENTHREADS_LIBRARY)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY
|
||||
NAMES OpenThreads OpenThreadsWin32
|
||||
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES lib64 lib
|
||||
)
|
||||
|
||||
IF(NOT OPENTHREADS_LIBRARY)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY
|
||||
NAMES OpenThreads OpenThreadsWin32
|
||||
PATHS
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
/usr/local/lib64
|
||||
/usr/local/lib
|
||||
/usr/lib64
|
||||
/usr/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
|
||||
)
|
||||
ENDIF(NOT OPENTHREADS_LIBRARY)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY
|
||||
NAMES OpenThreads OpenThreadsWin32
|
||||
PATHS
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
/usr/local/lib64
|
||||
/usr/local/lib
|
||||
/usr/lib64
|
||||
/usr/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
|
||||
@@ -133,40 +133,37 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
|
||||
$ENV{OSG_DIR}/lib64
|
||||
$ENV{OSG_DIR}/lib
|
||||
$ENV{OSG_DIR}
|
||||
${CMAKE_PREFIX_PATH}/lib64
|
||||
${CMAKE_PREFIX_PATH}/lib
|
||||
${CMAKE_PREFIX_PATH}
|
||||
$ENV{OSGDIR}/lib64
|
||||
$ENV{OSGDIR}/lib
|
||||
$ENV{OSGDIR}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
IF(NOT OPENTHREADS_LIBRARY_DEBUG)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
|
||||
NAMES OpenThreadsd OpenThreadsWin32d
|
||||
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
||||
PATH_SUFFIXES lib64 lib
|
||||
)
|
||||
ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
|
||||
NAMES OpenThreadsd OpenThreadsWin32d
|
||||
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES lib64 lib
|
||||
)
|
||||
|
||||
IF(NOT OPENTHREADS_LIBRARY_DEBUG)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
|
||||
NAMES OpenThreadsd OpenThreadsWin32d
|
||||
PATHS
|
||||
/usr/local/lib64
|
||||
/usr/local/lib
|
||||
/usr/lib64
|
||||
/usr/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
|
||||
)
|
||||
ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
|
||||
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
|
||||
NAMES OpenThreadsd OpenThreadsWin32d
|
||||
PATHS
|
||||
/usr/local/lib64
|
||||
/usr/local/lib
|
||||
/usr/lib64
|
||||
/usr/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
|
||||
)
|
||||
|
||||
|
||||
IF(OPENTHREADS_LIBRARY)
|
||||
|
||||
Reference in New Issue
Block a user