use PATH_SUFFIXES to simplify find_* calls

Especially remove "lib64" when the given paths are all Unix ones and "lib" is
also explicitely given. In that case CMake will search "lib64" anyway for
platforms where it is known to make sense.
This commit is contained in:
Rolf Eike Beer 2012-03-29 00:51:06 +02:00
parent b04650e163
commit cfe4ac4b41
19 changed files with 195 additions and 242 deletions

View File

@ -20,13 +20,15 @@ find_path(DART_ROOT README.INSTALL
HINTS HINTS
ENV DART_ROOT ENV DART_ROOT
PATHS PATHS
${PROJECT_SOURCE_DIR}/Dart ${PROJECT_SOURCE_DIR}
/usr/share/Dart /usr/share
C:/Dart C:/
"$ENV{ProgramFiles}/Dart" "C:/Program Files"
"C:/Program Files/Dart" ${PROJECT_SOURCE_DIR}/..
${PROJECT_SOURCE_DIR}/../Dart [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?"
) )

View File

@ -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

View File

@ -91,7 +91,7 @@ find_library(GDAL_LIBRARY
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

View File

@ -42,7 +42,7 @@ 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

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}
) )

View File

@ -41,7 +41,7 @@ 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
@ -61,7 +61,7 @@ else()
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

View File

@ -42,7 +42,7 @@ 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

View File

@ -87,7 +87,7 @@ 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
@ -107,7 +107,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)

View File

@ -40,7 +40,7 @@ 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

View File

@ -65,7 +65,7 @@ find_library(PRODUCER_LIBRARY
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

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 ()

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. HINTS
ENV QUICKTIME_DIR
if(APPLE) PATH_SUFFIXES
find_path(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h) include
find_library(QUICKTIME_LIBRARY QuickTime) )
else() find_library(QUICKTIME_LIBRARY QuickTime
find_path(QUICKTIME_INCLUDE_DIR QuickTime.h HINTS
HINTS ENV QUICKTIME_DIR
$ENV{QUICKTIME_DIR}/include PATH_SUFFIXES
ENV QUICKTIME_DIR lib
) )
find_library(QUICKTIME_LIBRARY QuickTime
HINTS
$ENV{QUICKTIME_DIR}/lib
ENV QUICKTIME_DIR
)
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

View File

@ -88,7 +88,7 @@ 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
@ -106,7 +106,7 @@ if(NOT SDL_BUILDING_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

View File

@ -29,24 +29,18 @@ 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
@ -54,7 +48,7 @@ find_library(SDLIMAGE_LIBRARY
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

View File

@ -29,24 +29,18 @@ 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
@ -54,7 +48,7 @@ find_library(SDLMIXER_LIBRARY
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

View File

@ -29,31 +29,25 @@ 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

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}/include
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES
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}/lib
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES
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}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV OGGDIR ENV OGGDIR
$ENV{SDLSOUNDDIR}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV VORBISDIR ENV VORBISDIR
$ENV{SDLSOUNDDIR}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES
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}/lib
ENV VORBISDIR ENV VORBISDIR
$ENV{SPEEXDIR}/lib
ENV SPEEXDIR ENV SPEEXDIR
$ENV{SDLSOUNDDIR}/lib
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
$ENV{SDLDIR}/lib
ENV SDLDIR ENV SDLDIR
/sw/lib /sw
/opt/local/lib /opt/local
/opt/csw/lib /opt/csw
/opt/lib /opt
PATH_SUFFIXES 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})

View File

@ -29,24 +29,18 @@ 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
@ -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)

View File

@ -54,7 +54,7 @@ function(OSG_FIND_LIBRARY module library)
ENV OSG_DIR ENV OSG_DIR
ENV OSGDIR ENV OSGDIR
ENV OSG_ROOT ENV OSG_ROOT
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts
@ -70,7 +70,7 @@ function(OSG_FIND_LIBRARY module library)
ENV OSG_DIR ENV OSG_DIR
ENV OSGDIR ENV OSGDIR
ENV OSG_ROOT ENV OSG_ROOT
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib
PATHS PATHS
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts