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

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
This commit is contained in:
Philip Lowman 2012-08-18 17:03:18 -04:00
parent 224b5dea78 cfe4ac4b41
commit dd60ed2f4f
30 changed files with 342 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindCUDA.cmake
View File

@ -650,9 +650,11 @@ endif()
# Look for the SDK stuff. As of CUDA 3.0 NVSDKCUDA_ROOT has been replaced with # Look for the SDK stuff. As of CUDA 3.0 NVSDKCUDA_ROOT has been replaced with
# NVSDKCOMPUTE_ROOT with the old CUDA C contents moved into the C subdirectory # NVSDKCOMPUTE_ROOT with the old CUDA C contents moved into the C subdirectory
find_path(CUDA_SDK_ROOT_DIR common/inc/cutil.h find_path(CUDA_SDK_ROOT_DIR common/inc/cutil.h
HINTS
"$ENV{NVSDKCOMPUTE_ROOT}/C" "$ENV{NVSDKCOMPUTE_ROOT}/C"
"$ENV{NVSDKCUDA_ROOT}" ENV NVSDKCUDA_ROOT
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]"
PATHS
"/Developer/GPU\ Computing/C" "/Developer/GPU\ Computing/C"
) )

18
Modules/FindDart.cmake
View File

@ -17,14 +17,18 @@
# License text for the above reference.) # License text for the above reference.)
find_path(DART_ROOT README.INSTALL find_path(DART_ROOT README.INSTALL
$ENV{DART_ROOT} HINTS
${PROJECT_SOURCE_DIR}/Dart ENV DART_ROOT
/usr/share/Dart PATHS
C:/Dart ${PROJECT_SOURCE_DIR}
"$ENV{ProgramFiles}/Dart" /usr/share
"C:/Program Files/Dart" C:/
${PROJECT_SOURCE_DIR}/../Dart "C:/Program Files"
${PROJECT_SOURCE_DIR}/..
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Dart\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Dart\\InstallPath]
ENV ProgramFiles
PATH_SUFFIXES
Dart
DOC "If you have Dart installed, where is it located?" DOC "If you have Dart installed, where is it located?"
) )

4
Modules/FindFLTK.cmake
View File

@ -93,11 +93,13 @@ if(NOT FLTK_DIR)
# #
find_path(FLTK_DIR FLTKConfig.cmake find_path(FLTK_DIR FLTKConfig.cmake
# Look for an environment variable FLTK_DIR. # Look for an environment variable FLTK_DIR.
$ENV{FLTK_DIR} HINTS
ENV FLTK_DIR
# Look in places relative to the system executable search path. # Look in places relative to the system executable search path.
${FLTK_DIR_SEARCH} ${FLTK_DIR_SEARCH}
PATHS
# Look in standard UNIX install locations. # Look in standard UNIX install locations.
/usr/local/lib/fltk /usr/local/lib/fltk
/usr/lib/fltk /usr/lib/fltk

2
Modules/FindFLTK2.cmake
View File

@ -73,7 +73,7 @@ if(NOT FLTK2_DIR)
# #
find_path(FLTK2_DIR FLTK2Config.cmake find_path(FLTK2_DIR FLTK2Config.cmake
# Look for an environment variable FLTK2_DIR. # Look for an environment variable FLTK2_DIR.
$ENV{FLTK2_DIR} ENV FLTK2_DIR
# Look in places relative to the system executable search path. # Look in places relative to the system executable search path.
${FLTK2_DIR_SEARCH} ${FLTK2_DIR_SEARCH}

16
Modules/FindFreetype.cmake
View File

@ -44,7 +44,7 @@
# everything still works. # everything still works.
find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
HINTS HINTS
$ENV{FREETYPE_DIR} ENV FREETYPE_DIR
PATHS PATHS
/usr/local/X11R6/include /usr/local/X11R6/include
/usr/local/X11/include /usr/local/X11/include
@ -53,19 +53,19 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
HINTS HINTS
$ENV{FREETYPE_DIR}/include/freetype2 ENV FREETYPE_DIR
PATHS PATHS
/usr/local/X11R6/include /usr/local/X11R6
/usr/local/X11/include /usr/local/X11
/usr/freeware/include /usr/freeware
PATH_SUFFIXES freetype2 PATH_SUFFIXES include/freetype2 include
) )
find_library(FREETYPE_LIBRARY find_library(FREETYPE_LIBRARY
NAMES freetype libfreetype freetype219 NAMES freetype libfreetype freetype219
HINTS HINTS
$ENV{FREETYPE_DIR} ENV FREETYPE_DIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/usr/local/X11R6 /usr/local/X11R6
/usr/local/X11 /usr/local/X11

14
Modules/FindGDAL.cmake
View File

@ -42,8 +42,8 @@
find_path(GDAL_INCLUDE_DIR gdal.h find_path(GDAL_INCLUDE_DIR gdal.h
HINTS HINTS
$ENV{GDAL_DIR} ENV GDAL_DIR
$ENV{GDAL_ROOT} ENV GDAL_ROOT
PATH_SUFFIXES PATH_SUFFIXES
include/gdal include/gdal
include/GDAL include/GDAL
@ -64,8 +64,8 @@ if(UNIX)
# libgdal.so... # libgdal.so...
find_program(GDAL_CONFIG gdal-config find_program(GDAL_CONFIG gdal-config
HINTS HINTS
$ENV{GDAL_DIR} ENV GDAL_DIR
$ENV{GDAL_ROOT} ENV GDAL_ROOT
PATH_SUFFIXES bin PATH_SUFFIXES bin
PATHS PATHS
/sw # Fink /sw # Fink
@ -88,10 +88,10 @@ endif()
find_library(GDAL_LIBRARY find_library(GDAL_LIBRARY
NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
HINTS HINTS
$ENV{GDAL_DIR} ENV GDAL_DIR
$ENV{GDAL_ROOT} ENV GDAL_ROOT
${_gdal_libpath} ${_gdal_libpath}
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw /sw
/opt/local /opt/local

6
Modules/FindGIF.cmake
View File

@ -28,7 +28,7 @@
find_path(GIF_INCLUDE_DIR gif_lib.h find_path(GIF_INCLUDE_DIR gif_lib.h
HINTS HINTS
$ENV{GIF_DIR} ENV GIF_DIR
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -41,8 +41,8 @@ set(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib giflib4)
find_library(GIF_LIBRARY find_library(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS} NAMES ${POTENTIAL_GIF_LIBS}
HINTS HINTS
$ENV{GIF_DIR} ENV GIF_DIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/usr/freeware /usr/freeware

26
Modules/FindGTK2.cmake
View File

@ -172,7 +172,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
sigc++-2.0 sigc++-2.0
) )
set(_suffixes) set(_suffixes include lib)
foreach(_d ${_relatives}) foreach(_d ${_relatives})
list(APPEND _suffixes ${_d}) list(APPEND _suffixes ${_d})
list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include
@ -186,23 +186,15 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
find_path(${_var} ${_hdr} find_path(${_var} ${_hdr}
PATHS PATHS
/usr/local/lib64 /usr/local/lib64
/usr/local/lib
/usr/lib64 /usr/lib64
/usr/lib /opt/gnome
/opt/gnome/include /opt/openwin
/opt/gnome/lib /usr/openwin
/opt/openwin/include /sw
/usr/openwin/lib /opt/local
/sw/include ENV GTKMM_BASEPATH
/sw/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
/opt/local/include [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
/opt/local/lib
$ENV{GTKMM_BASEPATH}/include
$ENV{GTKMM_BASEPATH}/lib
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
PATH_SUFFIXES PATH_SUFFIXES
${_suffixes} ${_suffixes}
) )

2
Modules/FindGTest.cmake
View File

@ -98,7 +98,7 @@ function(_gtest_find_library _name)
find_library(${_name} find_library(${_name}
NAMES ${ARGN} NAMES ${ARGN}
HINTS HINTS
$ENV{GTEST_ROOT} ENV GTEST_ROOT
${GTEST_ROOT} ${GTEST_ROOT}
PATH_SUFFIXES ${_gtest_libpath_suffixes} PATH_SUFFIXES ${_gtest_libpath_suffixes}
) )

12
Modules/FindLua50.cmake
View File

@ -26,7 +26,7 @@
find_path(LUA_INCLUDE_DIR lua.h find_path(LUA_INCLUDE_DIR lua.h
HINTS HINTS
$ENV{LUA_DIR} ENV LUA_DIR
PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -40,8 +40,8 @@ find_path(LUA_INCLUDE_DIR lua.h
find_library(LUA_LIBRARY_lua find_library(LUA_LIBRARY_lua
NAMES lua50 lua5.0 lua-5.0 lua5 lua NAMES lua50 lua5.0 lua-5.0 lua5 lua
HINTS HINTS
$ENV{LUA_DIR} ENV LUA_DIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
@ -59,9 +59,9 @@ else()
find_library(LUA_LIBRARY_lualib find_library(LUA_LIBRARY_lualib
NAMES lualib50 lualib5.0 lualib5 lualib NAMES lualib50 lualib5.0 lualib5 lualib
HINTS HINTS
$ENV{LUALIB_DIR} ENV LUALIB_DIR
$ENV{LUA_DIR} ENV LUA_DIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw /sw
/opt/local /opt/local

6
Modules/FindLua51.cmake
View File

@ -27,7 +27,7 @@
find_path(LUA_INCLUDE_DIR lua.h find_path(LUA_INCLUDE_DIR lua.h
HINTS HINTS
$ENV{LUA_DIR} ENV LUA_DIR
PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -41,8 +41,8 @@ find_path(LUA_INCLUDE_DIR lua.h
find_library(LUA_LIBRARY find_library(LUA_LIBRARY
NAMES lua51 lua5.1 lua-5.1 lua NAMES lua51 lua5.1 lua-5.1 lua
HINTS HINTS
$ENV{LUA_DIR} ENV LUA_DIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

4
Modules/FindOpenAL.cmake
View File

@ -63,7 +63,7 @@
find_path(OPENAL_INCLUDE_DIR al.h find_path(OPENAL_INCLUDE_DIR al.h
HINTS HINTS
$ENV{OPENALDIR} ENV OPENALDIR
PATH_SUFFIXES include/AL include/OpenAL include PATH_SUFFIXES include/AL include/OpenAL include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -78,7 +78,7 @@ find_path(OPENAL_INCLUDE_DIR al.h
find_library(OPENAL_LIBRARY find_library(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32 NAMES OpenAL al openal OpenAL32
HINTS HINTS
$ENV{OPENALDIR} ENV OPENALDIR
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks

48
Modules/FindOpenThreads.cmake
View File

@ -58,13 +58,13 @@
find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS HINTS
$ENV{OPENTHREADS_INCLUDE_DIR} ENV OPENTHREADS_INCLUDE_DIR
$ENV{OPENTHREADS_DIR} ENV OPENTHREADS_DIR
$ENV{OSG_INCLUDE_DIR} ENV OSG_INCLUDE_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
$ENV{OpenThreads_ROOT} ENV OpenThreads_ROOT
$ENV{OSG_ROOT} ENV OSG_ROOT
${OPENTHREADS_DIR} ${OPENTHREADS_DIR}
${OSG_DIR} ${OSG_DIR}
PATHS PATHS
@ -80,13 +80,13 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
find_library(OPENTHREADS_LIBRARY find_library(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32 NAMES OpenThreads OpenThreadsWin32
HINTS HINTS
$ENV{OPENTHREADS_LIBRARY_DIR} ENV OPENTHREADS_LIBRARY_DIR
$ENV{OPENTHREADS_DIR} ENV OPENTHREADS_DIR
$ENV{OSG_LIBRARY_DIR} ENV OSG_LIBRARY_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
$ENV{OpenThreads_ROOT} ENV OpenThreads_ROOT
$ENV{OSG_ROOT} ENV OSG_ROOT
${OPENTHREADS_DIR} ${OPENTHREADS_DIR}
${OSG_DIR} ${OSG_DIR}
PATHS PATHS
@ -95,20 +95,20 @@ find_library(OPENTHREADS_LIBRARY
/opt/csw /opt/csw
/opt /opt
/usr/freeware /usr/freeware
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
) )
find_library(OPENTHREADS_LIBRARY_DEBUG find_library(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d NAMES OpenThreadsd OpenThreadsWin32d
HINTS HINTS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR} ENV OPENTHREADS_DEBUG_LIBRARY_DIR
$ENV{OPENTHREADS_LIBRARY_DIR} ENV OPENTHREADS_LIBRARY_DIR
$ENV{OPENTHREADS_DIR} ENV OPENTHREADS_DIR
$ENV{OSG_LIBRARY_DIR} ENV OSG_LIBRARY_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
$ENV{OpenThreads_ROOT} ENV OpenThreads_ROOT
$ENV{OSG_ROOT} ENV OSG_ROOT
${OPENTHREADS_DIR} ${OPENTHREADS_DIR}
${OSG_DIR} ${OSG_DIR}
PATHS PATHS
@ -117,7 +117,7 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
/opt/csw /opt/csw
/opt /opt
/usr/freeware /usr/freeware
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
) )
if(OPENTHREADS_LIBRARY_DEBUG) if(OPENTHREADS_LIBRARY_DEBUG)

6
Modules/FindPhysFS.cmake
View File

@ -25,7 +25,7 @@
find_path(PHYSFS_INCLUDE_DIR physfs.h find_path(PHYSFS_INCLUDE_DIR physfs.h
HINTS HINTS
$ENV{PHYSFSDIR} ENV PHYSFSDIR
PATH_SUFFIXES include/physfs include PATH_SUFFIXES include/physfs include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -39,8 +39,8 @@ find_path(PHYSFS_INCLUDE_DIR physfs.h
find_library(PHYSFS_LIBRARY find_library(PHYSFS_LIBRARY
NAMES physfs NAMES physfs
HINTS HINTS
$ENV{PHYSFSDIR} ENV PHYSFSDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

7
Modules/FindPostgreSQL.cmake
View File

@ -74,11 +74,6 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
set(PostgreSQL_ROOT_DIRECTORIES $ENV{PostgreSQL_ROOT})
if(PostgreSQL_ROOT_DIRECTORIES)
file(TO_CMAKE_PATH ${PostgreSQL_ROOT_DIRECTORIES} PostgreSQL_ROOT_DIRECTORIES)
endif()
set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
"9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
@ -89,7 +84,7 @@ if ( WIN32 )
endforeach() endforeach()
endif() endif()
set( PostgreSQL_ROOT_DIRECTORIES set( PostgreSQL_ROOT_DIRECTORIES
${PostgreSQL_ROOT_DIRECTORIES} ENV PostgreSQL_ROOT
${PostgreSQL_ROOT} ${PostgreSQL_ROOT}
${PostgreSQL_ADDITIONAL_SEARCH_PATHS} ${PostgreSQL_ADDITIONAL_SEARCH_PATHS}
) )

14
Modules/FindProducer.cmake
View File

@ -44,9 +44,9 @@
# Try the user's environment request before anything else. # Try the user's environment request before anything else.
find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup
HINTS HINTS
$ENV{PRODUCER_DIR} ENV PRODUCER_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -62,10 +62,10 @@ find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup
find_library(PRODUCER_LIBRARY find_library(PRODUCER_LIBRARY
NAMES Producer NAMES Producer
HINTS HINTS
$ENV{PRODUCER_DIR} ENV PRODUCER_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw /sw
/opt/local /opt/local

106
Modules/FindQt3.cmake
View File

@ -91,17 +91,18 @@ if (QT_MT_REQUIRED)
qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib} qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3 qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
$ENV{QTDIR}/lib ENV QTDIR
${GLOB_PATHS_LIB} ${GLOB_PATHS_LIB}
/usr/local/qt/lib /usr/local/qt
/usr/lib/qt/lib /usr/lib/qt
/usr/lib/qt3/lib /usr/lib/qt3
/usr/lib/qt3/lib64 /usr/share/qt3
/usr/share/qt3/lib C:/Progra~1/qt
C:/Progra~1/qt/lib PATH_SUFFIXES
lib
) )
else () else ()
@ -111,17 +112,18 @@ else ()
qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib} qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3 qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
$ENV{QTDIR}/lib ENV QTDIR
${GLOB_PATHS_LIB} ${GLOB_PATHS_LIB}
/usr/local/qt/lib /usr/local/qt
/usr/lib/qt/lib /usr/lib/qt
/usr/lib/qt3/lib /usr/lib/qt3
/usr/lib/qt3/lib64 /usr/share/qt3
/usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
PATH_SUFFIXES
lib
) )
endif () endif ()
@ -129,35 +131,37 @@ endif ()
find_library(QT_QASSISTANTCLIENT_LIBRARY find_library(QT_QASSISTANTCLIENT_LIBRARY
NAMES qassistantclient NAMES qassistantclient
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
$ENV{QTDIR}/lib ENV QTDIR
${GLOB_PATHS_LIB} ${GLOB_PATHS_LIB}
/usr/local/qt/lib /usr/local/qt
/usr/lib/qt3/lib /usr/lib/qt3
/usr/lib/qt3/lib64 /usr/share/qt3
/usr/share/qt3/lib C:/Progra~1/qt
C:/Progra~1/qt/lib PATH_SUFFIXES
lib
) )
# qt 3 should prefer QTDIR over the PATH # qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE find_program(QT_MOC_EXECUTABLE
NAMES moc-qt3 moc NAMES moc-qt3 moc
HINTS HINTS
$ENV{QTDIR}/bin ENV QTDIR
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
$ENV{QTDIR}/bin
${GLOB_PATHS_BIN} ${GLOB_PATHS_BIN}
/usr/local/qt/bin /usr/local/qt
/usr/lib/qt/bin /usr/lib/qt
/usr/lib/qt3/bin /usr/lib/qt3
/usr/share/qt3/bin /usr/share/qt3
C:/Progra~1/qt/bin C:/Progra~1/qt
/usr/X11R6/bin /usr/X11R6
PATH_SUFFIXES
bin
) )
if(QT_MOC_EXECUTABLE) if(QT_MOC_EXECUTABLE)
@ -168,18 +172,20 @@ endif()
find_program(QT_UIC_EXECUTABLE find_program(QT_UIC_EXECUTABLE
NAMES uic-qt3 uic NAMES uic-qt3 uic
HINTS HINTS
$ENV{QTDIR}/bin ENV QTDIR
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
${GLOB_PATHS_BIN} ${GLOB_PATHS_BIN}
/usr/local/qt/bin /usr/local/qt
/usr/lib/qt/bin /usr/lib/qt
/usr/lib/qt3/bin /usr/lib/qt3
/usr/share/qt3/bin /usr/share/qt3
C:/Progra~1/qt/bin C:/Progra~1/qt
/usr/X11R6/bin /usr/X11R6
PATH_SUFFIXES
bin
) )
if(QT_UIC_EXECUTABLE) if(QT_UIC_EXECUTABLE)
@ -189,13 +195,15 @@ endif()
if (WIN32) if (WIN32)
find_library(QT_QTMAIN_LIBRARY qtmain find_library(QT_QTMAIN_LIBRARY qtmain
HINTS HINTS
$ENV{QTDIR}/lib ENV QTDIR
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
PATHS PATHS
"$ENV{ProgramFiles}/qt/lib" "$ENV{ProgramFiles}/qt"
"C:/Program Files/qt/lib" "C:/Program Files/qt"
PATH_SUFFIXES
lib
DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise." DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
) )
endif () endif ()

26
Modules/FindQuickTime.cmake
View File

@ -22,24 +22,18 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
# QuickTime on OS X looks different than QuickTime for Windows, find_path(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h QuickTime.h
# so I am going to case the two.
if(APPLE)
find_path(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
find_library(QUICKTIME_LIBRARY QuickTime)
else()
find_path(QUICKTIME_INCLUDE_DIR QuickTime.h
HINTS HINTS
$ENV{QUICKTIME_DIR}/include ENV QUICKTIME_DIR
$ENV{QUICKTIME_DIR} PATH_SUFFIXES
) include
find_library(QUICKTIME_LIBRARY QuickTime )
find_library(QUICKTIME_LIBRARY QuickTime
HINTS HINTS
$ENV{QUICKTIME_DIR}/lib ENV QUICKTIME_DIR
$ENV{QUICKTIME_DIR} PATH_SUFFIXES
) lib
endif() )
# handle the QUIETLY and REQUIRED arguments and set QUICKTIME_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set QUICKTIME_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE

9
Modules/FindRTI.cmake
View File

@ -35,18 +35,13 @@ macro(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
endif() endif()
endmacro() endmacro()
# Detect the CERTI installation, http://www.cert.fr/CERTI
if ("$ENV{CERTI_HOME}" STRGREATER "")
file(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_HOME)
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined CERTI_HOME: ${CERTI_HOME}")
endif ()
set(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM") set(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM")
# Detect the CERTI installation, http://www.cert.fr/CERTI
# Detect the MAK Technologies RTI installation, http://www.mak.com/products/rti.php # Detect the MAK Technologies RTI installation, http://www.mak.com/products/rti.php
# note: the following list is ordered to find the most recent version first # note: the following list is ordered to find the most recent version first
set(RTI_POSSIBLE_DIRS set(RTI_POSSIBLE_DIRS
${CERTI_HOME} ENV CERTI_HOME
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 3.2 MSVC++ 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 3.2 MSVC++ 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 3.2-win32-msvc++8.0;InstallLocation]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 3.2-win32-msvc++8.0;InstallLocation]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]"

10
Modules/FindSDL.cmake
View File

@ -67,7 +67,7 @@
find_path(SDL_INCLUDE_DIR SDL.h find_path(SDL_INCLUDE_DIR SDL.h
HINTS HINTS
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES include/SDL include PATH_SUFFIXES include/SDL include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
@ -87,8 +87,8 @@ find_path(SDL_INCLUDE_DIR SDL.h
find_library(SDL_LIBRARY_TEMP find_library(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1 NAMES SDL SDL-1.1
HINTS HINTS
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw /sw
/opt/local /opt/local
@ -105,8 +105,8 @@ if(NOT SDL_BUILDING_LIBRARY)
find_library(SDLMAIN_LIBRARY find_library(SDLMAIN_LIBRARY
NAMES SDLmain SDLmain-1.1 NAMES SDLmain SDLmain-1.1
HINTS HINTS
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw /sw
/opt/local /opt/local

26
Modules/FindSDL_image.cmake
View File

@ -27,34 +27,28 @@
find_path(SDLIMAGE_INCLUDE_DIR SDL_image.h find_path(SDLIMAGE_INCLUDE_DIR SDL_image.h
HINTS HINTS
$ENV{SDLIMAGEDIR} ENV SDLIMAGEDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES include PATH_SUFFIXES include include/SDL
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local/include/SDL
/usr/include/SDL
/usr/local/include/SDL12 /usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports /usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12 /usr/include/SDL12
/usr/include/SDL11 /usr/include/SDL11
/sw/include/SDL # Fink /sw # Fink
/sw/include /opt/local # DarwinPorts
/opt/local/include/SDL # DarwinPorts /opt/csw # Blastwave
/opt/local/include /opt
/opt/csw/include/SDL # Blastwave
/opt/csw/include
/opt/include/SDL
/opt/include
) )
find_library(SDLIMAGE_LIBRARY find_library(SDLIMAGE_LIBRARY
NAMES SDL_image NAMES SDL_image
HINTS HINTS
$ENV{SDLIMAGEDIR} ENV SDLIMAGEDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

26
Modules/FindSDL_mixer.cmake
View File

@ -27,34 +27,28 @@
find_path(SDLMIXER_INCLUDE_DIR SDL_mixer.h find_path(SDLMIXER_INCLUDE_DIR SDL_mixer.h
HINTS HINTS
$ENV{SDLMIXERDIR} ENV SDLMIXERDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES include PATH_SUFFIXES include include/SDL
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local/include/SDL
/usr/include/SDL
/usr/local/include/SDL12 /usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports /usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12 /usr/include/SDL12
/usr/include/SDL11 /usr/include/SDL11
/sw/include/SDL # Fink /sw # Fink
/sw/include /opt/local # DarwinPorts
/opt/local/include/SDL # DarwinPorts /opt/csw # Blastwave
/opt/local/include /opt
/opt/csw/include/SDL # Blastwave
/opt/csw/include
/opt/include/SDL
/opt/include
) )
find_library(SDLMIXER_LIBRARY find_library(SDLMIXER_LIBRARY
NAMES SDL_mixer NAMES SDL_mixer
HINTS HINTS
$ENV{SDLMIXERDIR} ENV SDLMIXERDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

26
Modules/FindSDL_net.cmake
View File

@ -27,33 +27,27 @@
find_path(SDLNET_INCLUDE_DIR SDL_net.h find_path(SDLNET_INCLUDE_DIR SDL_net.h
HINTS HINTS
$ENV{SDLNETDIR} ENV SDLNETDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES include PATH_SUFFIXES include include/SDL
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local/include/SDL
/usr/include/SDL
/usr/local/include/SDL12 /usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports /usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12 /usr/include/SDL12
/usr/include/SDL11 /usr/include/SDL11
/sw/include/SDL # Fink /sw # Fink
/sw/include /opt/local # DarwinPorts
/opt/local/include/SDL # DarwinPorts /opt/csw # Blastwave
/opt/local/include /opt
/opt/csw/include/SDL # Blastwave
/opt/csw/include
/opt/include/SDL
/opt/include
) )
find_library(SDLNET_LIBRARY find_library(SDLNET_LIBRARY
NAMES SDL_net NAMES SDL_net
HINTS HINTS
$ENV{SDLNETDIR} ENV SDLNETDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

205
Modules/FindSDL_sound.cmake
View File

@ -75,39 +75,33 @@ mark_as_advanced(SDL_SOUND_EXTRAS)
# Find SDL_sound.h # Find SDL_sound.h
find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h
HINTS HINTS
$ENV{SDLSOUNDDIR}/include ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR} ENV SDLDIR
$ENV{SDLDIR}/include PATH_SUFFIXES
$ENV{SDLDIR} include include/SDL
PATHS PATHS
/usr/local/include/SDL
/usr/include/SDL
/usr/local/include/SDL12 /usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports /usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12 /usr/include/SDL12
/usr/include/SDL11 /usr/include/SDL11
/sw/include/SDL # Fink /sw # Fink
/sw/include /opt/local # DarwinPorts
/opt/local/include/SDL # DarwinPorts /opt/csw # Blastwave
/opt/local/include /opt
/opt/csw/include/SDL # Blastwave
/opt/csw/include
/opt/include/SDL
/opt/include
) )
find_library(SDL_SOUND_LIBRARY find_library(SDL_SOUND_LIBRARY
NAMES SDL_sound NAMES SDL_sound
HINTS HINTS
$ENV{SDLSOUNDDIR}/lib ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR} ENV SDLDIR
$ENV{SDLDIR}/lib PATH_SUFFIXES
$ENV{SDLDIR} lib
PATHS PATHS
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
) )
if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
@ -212,37 +206,35 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(MIKMOD_LIBRARY find_library(MIKMOD_LIBRARY
NAMES libmikmod-coreaudio mikmod NAMES libmikmod-coreaudio mikmod
PATHS PATHS
$ENV{MIKMODDIR}/lib ENV MIKMODDIR
$ENV{MIKMODDIR} ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR}/lib ENV SDLDIR
$ENV{SDLSOUNDDIR} /sw
$ENV{SDLDIR}/lib /opt/local
$ENV{SDLDIR} /opt/csw
/sw/lib /opt
/opt/local/lib PATH_SUFFIXES
/opt/csw/lib lib
/opt/lib
) )
if(MIKMOD_LIBRARY) if(MIKMOD_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY})
endif() endif(MIKMOD_LIBRARY)
endif() endif("${MY_OUTPUT}" MATCHES "MikMod_")
# Find ModPlug # Find ModPlug
if("${MY_OUTPUT}" MATCHES "MODPLUG_") if("${MY_OUTPUT}" MATCHES "MODPLUG_")
find_library(MODPLUG_LIBRARY find_library(MODPLUG_LIBRARY
NAMES modplug NAMES modplug
PATHS PATHS
$ENV{MODPLUGDIR}/lib ENV MODPLUGDIR
$ENV{MODPLUGDIR} ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR}/lib ENV SDLDIR
$ENV{SDLSOUNDDIR} /sw
$ENV{SDLDIR}/lib /opt/local
$ENV{SDLDIR} /opt/csw
/sw/lib /opt
/opt/local/lib PATH_SUFFIXES
/opt/csw/lib lib
/opt/lib
) )
if(MODPLUG_LIBRARY) if(MODPLUG_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MODPLUG_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MODPLUG_LIBRARY})
@ -255,18 +247,16 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(VORBIS_LIBRARY find_library(VORBIS_LIBRARY
NAMES vorbis Vorbis VORBIS NAMES vorbis Vorbis VORBIS
PATHS PATHS
$ENV{VORBISDIR}/lib ENV VORBISDIR
$ENV{VORBISDIR} ENV OGGDIR
$ENV{OGGDIR}/lib ENV SDLSOUNDDIR
$ENV{OGGDIR} ENV SDLDIR
$ENV{SDLSOUNDDIR}/lib /sw
$ENV{SDLSOUNDDIR} /opt/local
$ENV{SDLDIR}/lib /opt/csw
$ENV{SDLDIR} /opt
/sw/lib PATH_SUFFIXES
/opt/local/lib lib
/opt/csw/lib
/opt/lib
) )
if(VORBIS_LIBRARY) if(VORBIS_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY})
@ -275,18 +265,16 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(OGG_LIBRARY find_library(OGG_LIBRARY
NAMES ogg Ogg OGG NAMES ogg Ogg OGG
PATHS PATHS
$ENV{OGGDIR}/lib ENV OGGDIR
$ENV{OGGDIR} ENV VORBISDIR
$ENV{VORBISDIR}/lib ENV SDLSOUNDDIR
$ENV{VORBISDIR} ENV SDLDIR
$ENV{SDLSOUNDDIR}/lib /sw
$ENV{SDLSOUNDDIR} /opt/local
$ENV{SDLDIR}/lib /opt/csw
$ENV{SDLDIR} /opt
/sw/lib PATH_SUFFIXES
/opt/local/lib lib
/opt/csw/lib
/opt/lib
) )
if(OGG_LIBRARY) if(OGG_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
@ -299,16 +287,15 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(SMPEG_LIBRARY find_library(SMPEG_LIBRARY
NAMES smpeg SMPEG Smpeg SMpeg NAMES smpeg SMPEG Smpeg SMpeg
PATHS PATHS
$ENV{SMPEGDIR}/lib ENV SMPEGDIR
$ENV{SMPEGDIR} ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR}/lib ENV SDLDIR
$ENV{SDLSOUNDDIR} /sw
$ENV{SDLDIR}/lib /opt/local
$ENV{SDLDIR} /opt/csw
/sw/lib /opt
/opt/local/lib PATH_SUFFIXES
/opt/csw/lib lib
/opt/lib
) )
if(SMPEG_LIBRARY) if(SMPEG_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY})
@ -321,16 +308,15 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(FLAC_LIBRARY find_library(FLAC_LIBRARY
NAMES flac FLAC NAMES flac FLAC
PATHS PATHS
$ENV{FLACDIR}/lib ENV FLACDIR
$ENV{FLACDIR} ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR}/lib ENV SDLDIR
$ENV{SDLSOUNDDIR} /sw
$ENV{SDLDIR}/lib /opt/local
$ENV{SDLDIR} /opt/csw
/sw/lib /opt
/opt/local/lib PATH_SUFFIXES
/opt/csw/lib lib
/opt/lib
) )
if(FLAC_LIBRARY) if(FLAC_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY})
@ -346,16 +332,15 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(SPEEX_LIBRARY find_library(SPEEX_LIBRARY
NAMES speex SPEEX NAMES speex SPEEX
PATHS PATHS
$ENV{SPEEXDIR}/lib ENV SPEEXDIR
$ENV{SPEEXDIR} ENV SDLSOUNDDIR
$ENV{SDLSOUNDDIR}/lib ENV SDLDIR
$ENV{SDLSOUNDDIR} /sw
$ENV{SDLDIR}/lib /opt/local
$ENV{SDLDIR} /opt/csw
/sw/lib /opt
/opt/local/lib PATH_SUFFIXES
/opt/csw/lib lib
/opt/lib
) )
if(SPEEX_LIBRARY) if(SPEEX_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY})
@ -367,20 +352,16 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
find_library(OGG_LIBRARY find_library(OGG_LIBRARY
NAMES ogg Ogg OGG NAMES ogg Ogg OGG
PATHS PATHS
$ENV{OGGDIR}/lib ENV OGGDIR
$ENV{OGGDIR} ENV VORBISDIR
$ENV{VORBISDIR}/lib ENV SPEEXDIR
$ENV{VORBISDIR} ENV SDLSOUNDDIR
$ENV{SPEEXDIR}/lib ENV SDLDIR
$ENV{SPEEXDIR} /sw
$ENV{SDLSOUNDDIR}/lib /opt/local
$ENV{SDLSOUNDDIR} /opt/csw
$ENV{SDLDIR}/lib /opt
$ENV{SDLDIR} PATH_SUFFIXES lib
/sw/lib
/opt/local/lib
/opt/csw/lib
/opt/lib
) )
if(OGG_LIBRARY) if(OGG_LIBRARY)
set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY}) set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})

26
Modules/FindSDL_ttf.cmake
View File

@ -27,33 +27,27 @@
find_path(SDLTTF_INCLUDE_DIR SDL_ttf.h find_path(SDLTTF_INCLUDE_DIR SDL_ttf.h
HINTS HINTS
$ENV{SDLTTFDIR} ENV SDLTTFDIR
$ENV{SDLDIR} ENV SDLDIR
PATH_SUFFIXES include PATH_SUFFIXES include include/SDL
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local/include/SDL
/usr/include/SDL
/usr/local/include/SDL12 /usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports /usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12 /usr/include/SDL12
/usr/include/SDL11 /usr/include/SDL11
/sw/include/SDL # Fink /sw # Fink
/sw/include /opt/local # DarwinPorts
/opt/local/include/SDL # DarwinPorts /opt/csw # Blastwave
/opt/local/include /opt
/opt/csw/include/SDL # Blastwave
/opt/csw/include
/opt/include/SDL
/opt/include
) )
find_library(SDLTTF_LIBRARY find_library(SDLTTF_LIBRARY
NAMES SDL_ttf NAMES SDL_ttf
HINTS HINTS
$ENV{SDLTTFDIR} ENV SDLTTFDIR
$ENV{SDLDIR} ENV SDLDIR
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
@ -61,7 +55,7 @@ find_library(SDLTTF_LIBRARY
/opt/local /opt/local
/opt/csw /opt/csw
/opt /opt
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
) )
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

3
Modules/FindSquish.cmake
View File

@ -54,8 +54,9 @@ if(NOT SQUISH_INSTALL_DIR)
# Look for an installation # Look for an installation
find_path(SQUISH_INSTALL_DIR bin/squishrunner find_path(SQUISH_INSTALL_DIR bin/squishrunner
HINTS
# Look for an environment variable SQUISH_INSTALL_DIR. # Look for an environment variable SQUISH_INSTALL_DIR.
$ENV{SQUISH_INSTALL_DIR} ENV SQUISH_INSTALL_DIR
# Look in places relative to the system executable search path. # Look in places relative to the system executable search path.
${SQUISH_INSTALL_DIR_SEARCH} ${SQUISH_INSTALL_DIR_SEARCH}

2
Modules/FindVTK.cmake
View File

@ -90,7 +90,7 @@ if(_VTK_40_ALLOW AND NOT VTK_DIR)
find_path(VTK_DIR find_path(VTK_DIR
NAMES UseVTK.cmake NAMES UseVTK.cmake
PATH_SUFFIXES vtk-4.0 vtk PATH_SUFFIXES vtk-4.0 vtk
HINTS $ENV{VTK_DIR} HINTS ENV VTK_DIR
PATHS PATHS

28
Modules/Findosg_functions.cmake
View File

@ -27,10 +27,10 @@ function(OSG_FIND_PATH module header)
# Try the user's environment request before anything else. # Try the user's environment request before anything else.
find_path(${module_uc}_INCLUDE_DIR ${header} find_path(${module_uc}_INCLUDE_DIR ${header}
HINTS HINTS
$ENV{${module_uc}_DIR} ENV ${module_uc}_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
$ENV{OSG_ROOT} ENV OSG_ROOT
${${module_uc}_DIR} ${${module_uc}_DIR}
${OSG_DIR} ${OSG_DIR}
PATH_SUFFIXES include PATH_SUFFIXES include
@ -53,13 +53,13 @@ function(OSG_FIND_LIBRARY module library)
find_library(${module_uc}_LIBRARY find_library(${module_uc}_LIBRARY
NAMES ${library} NAMES ${library}
HINTS HINTS
$ENV{${module_uc}_DIR} ENV ${module_uc}_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
$ENV{OSG_ROOT} ENV OSG_ROOT
${${module_uc}_DIR} ${${module_uc}_DIR}
${OSG_DIR} ${OSG_DIR}
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts
@ -71,13 +71,13 @@ function(OSG_FIND_LIBRARY module library)
find_library(${module_uc}_LIBRARY_DEBUG find_library(${module_uc}_LIBRARY_DEBUG
NAMES ${library}d NAMES ${library}d
HINTS HINTS
$ENV{${module_uc}_DIR} ENV ${module_uc}_DIR
$ENV{OSG_DIR} ENV OSG_DIR
$ENV{OSGDIR} ENV OSGDIR
$ENV{OSG_ROOT} ENV OSG_ROOT
${${module_uc}_DIR} ${${module_uc}_DIR}
${OSG_DIR} ${OSG_DIR}
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts

6
Modules/FindwxWidgets.cmake
View File

@ -421,12 +421,12 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
find_path(wxWidgets_ROOT_DIR find_path(wxWidgets_ROOT_DIR
NAMES include/wx/wx.h NAMES include/wx/wx.h
PATHS PATHS
$ENV{wxWidgets_ROOT_DIR} ENV wxWidgets_ROOT_DIR
$ENV{WXWIN} ENV WXWIN
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x
C:/ C:/
D:/ D:/
$ENV{ProgramFiles} ENV ProgramFiles
PATH_SUFFIXES PATH_SUFFIXES
wxWidgets-2.9.4 wxWidgets-2.9.4
wxWidgets-2.9.3 wxWidgets-2.9.3

29
Modules/FindwxWindows.cmake
View File

@ -106,18 +106,6 @@ if(WIN32_STYLE_FIND)
## fix the root dir to avoid mixing of headers/libs from different ## fix the root dir to avoid mixing of headers/libs from different
## versions/builds: ## versions/builds:
set (WXWINDOWS_POSSIBLE_ROOT_PATHS
$ENV{WXWIN}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" ## WX 2.6.x
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWindows_is1;Inno Setup: App Path]" ## WX 2.4.x
C:\\wxWidgets-2.6.2
D:\\wxWidgets-2.6.2
C:\\wxWidgets-2.6.1
D:\\wxWidgets-2.6.1
C:\\wxWindows-2.4.2
D:\\wxWindows-2.4.2
)
## WX supports monolithic and multiple smaller libs (since 2.5.x), we prefer monolithic for now. ## WX supports monolithic and multiple smaller libs (since 2.5.x), we prefer monolithic for now.
## monolithic = WX is built as a single big library ## monolithic = WX is built as a single big library
## e.g. compile on WIN32 as "nmake -f makefile.vc MONOLITHIC=1 BUILD=debug SHARED=0 USE_OPENGL=1" (JW) ## e.g. compile on WIN32 as "nmake -f makefile.vc MONOLITHIC=1 BUILD=debug SHARED=0 USE_OPENGL=1" (JW)
@ -132,7 +120,18 @@ if(WIN32_STYLE_FIND)
## avoid mixing of headers and libs between multiple installed WX versions, ## avoid mixing of headers and libs between multiple installed WX versions,
## select just one tree here: ## select just one tree here:
find_path(WXWINDOWS_ROOT_DIR include/wx/wx.h find_path(WXWINDOWS_ROOT_DIR include/wx/wx.h
${WXWINDOWS_POSSIBLE_ROOT_PATHS} ) HINTS
ENV WXWIN
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" ## WX 2.6.x
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWindows_is1;Inno Setup: App Path]" ## WX 2.4.x
PATHS
C:/wxWidgets-2.6.2
D:/wxWidgets-2.6.2
C:/wxWidgets-2.6.1
D:/wxWidgets-2.6.1
C:/wxWindows-2.4.2
D:/wxWindows-2.4.2
)
# message("DBG found WXWINDOWS_ROOT_DIR: ${WXWINDOWS_ROOT_DIR}") # message("DBG found WXWINDOWS_ROOT_DIR: ${WXWINDOWS_ROOT_DIR}")
@ -600,8 +599,10 @@ else()
# wx-config should be in your path anyhow, usually no need to set WXWIN or # wx-config should be in your path anyhow, usually no need to set WXWIN or
# search in ../wx or ../../wx # search in ../wx or ../../wx
find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
$ENV{WXWIN} HINTS
ENV WXWIN
$ENV{WXWIN}/bin $ENV{WXWIN}/bin
PATHS
../wx/bin ../wx/bin
../../wx/bin ) ../../wx/bin )