From e2ec3b671b3753da42df167ba1a4e496d08b5ce2 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 9 Jun 2008 16:04:06 -0400
Subject: ENH: Cleanup Find* modules with new HINTS feature
- The find_* commands now provide a HINTS option.
- The option specifies paths to be preferred over the system paths.
- Many Find* modules were using two find calls with NO_DEFAULT_PATH
to approximate the behavior, but that blocked users from overriding
things with CMAKE_PREFIX_PATH.
- This commit uses the HINTS feature to get desired behavior in
only one find command call.
---
Modules/CMakeFindBinUtils.cmake | 31 +++++++----------------
Modules/FindCurses.cmake | 10 +++-----
Modules/FindFreetype.cmake | 22 ++++-------------
Modules/FindGDAL.cmake | 17 +++----------
Modules/FindGIF.cmake | 18 ++------------
Modules/FindKDE3.cmake | 50 ++++++++++++--------------------------
Modules/FindKDE4.cmake | 5 +---
Modules/FindLua50.cmake | 25 +++----------------
Modules/FindLua51.cmake | 17 +++----------
Modules/FindOpenAL.cmake | 17 +++----------
Modules/FindOpenThreads.cmake | 27 +++-----------------
Modules/FindPhysFS.cmake | 19 +++------------
Modules/FindProducer.cmake | 16 +++---------
Modules/FindQt3.cmake | 14 +++--------
Modules/FindQuickTime.cmake | 9 ++-----
Modules/FindSDL.cmake | 24 +++---------------
Modules/FindSDL_image.cmake | 16 +++---------
Modules/FindSDL_mixer.cmake | 16 +++---------
Modules/FindSDL_net.cmake | 16 +++---------
Modules/FindSDL_sound.cmake | 11 +++------
Modules/FindSDL_ttf.cmake | 15 ++----------
Modules/FindTCL.cmake | 14 ++---------
Modules/FindTclsh.cmake | 6 +----
Modules/FindWish.cmake | 6 +----
Modules/FindXMLRPC.cmake | 4 +--
Modules/Findosg.cmake | 17 +++----------
Modules/FindosgDB.cmake | 17 +++----------
Modules/FindosgFX.cmake | 17 +++----------
Modules/FindosgGA.cmake | 17 +++----------
Modules/FindosgIntrospection.cmake | 17 +++----------
Modules/FindosgManipulator.cmake | 17 +++----------
Modules/FindosgParticle.cmake | 17 +++----------
Modules/FindosgProducer.cmake | 17 +++----------
Modules/FindosgShadow.cmake | 17 +++----------
Modules/FindosgSim.cmake | 17 +++----------
Modules/FindosgTerrain.cmake | 17 +++----------
Modules/FindosgText.cmake | 17 +++----------
Modules/FindosgUtil.cmake | 17 +++----------
Modules/FindosgViewer.cmake | 17 +++----------
39 files changed, 132 insertions(+), 531 deletions(-)
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 9d76e75..dc64673 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -22,8 +22,7 @@ IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC"
OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC"
OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
- FIND_PROGRAM(CMAKE_LINKER NAMES link PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_LINKER NAMES link)
+ FIND_PROGRAM(CMAKE_LINKER NAMES link HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
MARK_AS_ADVANCED(CMAKE_LINKER)
@@ -32,29 +31,18 @@ ELSE("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC"
OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC"
OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
- FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar)
+ FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
- FIND_PROGRAM(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib)
+ FIND_PROGRAM(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
IF(NOT CMAKE_RANLIB)
SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
ENDIF(NOT CMAKE_RANLIB)
- FIND_PROGRAM(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip)
-
- FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld)
-
- FIND_PROGRAM(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm)
-
- FIND_PROGRAM(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump)
-
- FIND_PROGRAM(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy)
+ FIND_PROGRAM(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ FIND_PROGRAM(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ FIND_PROGRAM(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ FIND_PROGRAM(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
MARK_AS_ADVANCED(CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER CMAKE_NM CMAKE_OBJDUMP CMAKE_OBJCOPY)
@@ -65,8 +53,7 @@ ENDIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC"
# on Apple there really should be install_name_tool
IF(APPLE)
- FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
- FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool)
+ FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
IF(NOT CMAKE_INSTALL_NAME_TOOL)
MESSAGE(FATAL_ERROR "Could not find install_name_tool, please check your installation.")
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index c854ba8..6c8de0c 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -66,12 +66,10 @@ ELSE(NOT CURSES_USE_NCURSES)
FIND_FILE(CURSES_HAVE_NCURSES_H ncurses.h)
FIND_FILE(CURSES_HAVE_NCURSES_NCURSES_H ncurses/ncurses.h)
FIND_FILE(CURSES_HAVE_NCURSES_CURSES_H ncurses/curses.h)
- FIND_FILE(CURSES_HAVE_CURSES_H curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH)
- FIND_FILE(CURSES_HAVE_CURSES_H curses.h)
+ FIND_FILE(CURSES_HAVE_CURSES_H curses.h HINTS "${_cursesParentDir}/include")
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH ncurses.h ncurses/ncurses.h ncurses/curses.h)
- FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h PATHS "${_cursesParentDir}/include" NO_DEFAULT_PATH)
- FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h)
+ FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h HINTS "${_cursesParentDir}/include")
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache wqith these variables set
@@ -81,10 +79,10 @@ ENDIF(NOT CURSES_USE_NCURSES)
-FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
+FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
-FIND_LIBRARY(CURSES_FORM_LIBRARY form PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
+FIND_LIBRARY(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
FIND_LIBRARY(CURSES_FORM_LIBRARY form )
# for compatibility with older FindCurses.cmake this has to be in the cache
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index c128c47..3c83bfa 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -29,13 +29,9 @@
# I'm going to attempt to cut out the middleman and hope
# everything still works.
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+ HINTS
$ENV{FREETYPE_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
PATHS
/usr/local/X11R6/include
/usr/local/X11/include
@@ -46,11 +42,9 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
)
FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+ HINTS
$ENV{FREETYPE_DIR}/include/freetype2
- NO_DEFAULT_PATH
-)
-
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+ PATHS
/usr/local/X11R6/include
/usr/local/X11/include
/usr/X11/include
@@ -62,21 +56,15 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
FIND_LIBRARY(FREETYPE_LIBRARY
NAMES freetype libfreetype freetype219
- PATHS
+ HINTS
$ENV{FREETYPE_DIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(FREETYPE_LIBRARY
- NAMES freetype libfreetype freetype219
+ PATH_SUFFIXES lib64 lib
PATHS
/usr/local/X11R6
/usr/local/X11
/usr/X11
/sw
/usr/freeware
- PATH_SUFFIXES lib64 lib
)
# set the user variables
diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake
index a92b04c..e21fe83 100644
--- a/Modules/FindGDAL.cmake
+++ b/Modules/FindGDAL.cmake
@@ -20,14 +20,9 @@
# #include "gdal.h"
FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+ HINTS
$ENV{GDAL_DIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES include
-)
-
-
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+ PATH_SUFFIXES include
PATHS
~/Library/Frameworks/gdal.framework/Headers
/Library/Frameworks/gdal.framework/Headers
@@ -53,14 +48,9 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
FIND_LIBRARY(GDAL_LIBRARY
NAMES gdal GDAL
- PATHS
+ HINTS
$ENV{GDAL_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(GDAL_LIBRARY
- NAMES gdal GDAL
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -72,7 +62,6 @@ FIND_LIBRARY(GDAL_LIBRARY
/opt
/usr/freeware
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
- PATH_SUFFIXES lib64 lib
)
SET(GDAL_FOUND "NO")
diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake
index 305be68..1d3a5ec 100644
--- a/Modules/FindGIF.cmake
+++ b/Modules/FindGIF.cmake
@@ -10,15 +10,9 @@
# Modifications by Alexander Neundorf
FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
- PATHS
+ HINTS
$ENV{GIF_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-
-
-FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -32,16 +26,9 @@ SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib)
FIND_LIBRARY(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS}
- PATHS
+ HINTS
$ENV{GIF_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
-)
-
-
-
-FIND_LIBRARY(GIF_LIBRARY
- NAMES ${POTENTIAL_GIF_LIBS}
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -53,7 +40,6 @@ FIND_LIBRARY(GIF_LIBRARY
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
/usr/freeware
- PATH_SUFFIXES lib64 lib
)
# see readme.txt
diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake
index d8ef875..79d66ec 100644
--- a/Modules/FindKDE3.cmake
+++ b/Modules/FindKDE3.cmake
@@ -103,27 +103,15 @@ ENDIF (NOT CMAKE_BUILD_TYPE)
#SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
#SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
-# all calls to FIND_PROGRAM/PATH/LIBRARY() follow the same scheme:
-# at first try some special paths with the argument "NO_DEFAULT_PATH"
-# so only these paths are checked
-# this is followed by a second call to FIND_PROGRAM/PATH/LIBRARY()
-# but this time without any paths and without NO_DEFAULT_PATH
-# this second call will do nothing if the first call already found
-# what it was looking for, if not, it will search only in the default
-# directories (/usr, /usr/local, etc.)
-
#now try to find some kde stuff
-FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config PATHS
+FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config
+ HINTS
$ENV{KDEDIR}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
-
-FIND_PROGRAM(KDECONFIG_EXECUTABLE kde-config)
-
-
SET(KDE3PREFIX)
IF(KDECONFIG_EXECUTABLE)
EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --version
@@ -143,29 +131,26 @@ ENDIF(KDECONFIG_EXECUTABLE)
# at first the KDE include direcory
# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
+ HINTS
$ENV{KDEDIR}/include
${KDE3PREFIX}/include
+ PATHS
/opt/kde3/include
/opt/kde/include
/usr/include/kde
/usr/local/include/kde
- NO_DEFAULT_PATH
)
-FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h)
-
#now the KDE library directory
FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
- PATHS
+ HINTS
$ENV{KDEDIR}/lib
${KDE3PREFIX}/lib
+ PATHS
/opt/kde3/lib
/opt/kde/lib
- NO_DEFAULT_PATH
)
-FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore)
-
SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
@@ -179,36 +164,33 @@ IF(NOT KDE3_LIBTOOL_DIR)
ENDIF(NOT KDE3_LIBTOOL_DIR)
#now search for the dcop utilities
-FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl PATHS
+FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl
+ HINTS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
-FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl)
-
-FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp PATHS
+FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp
+ HINTS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
-FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp)
-
-FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler PATHS
+FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler
+ HINTS
$ENV{KDEDIR}/bin
${KDE3PREFIX}/bin
+ PATHS
/opt/kde3/bin
/opt/kde/bin
- NO_DEFAULT_PATH
)
-FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler)
-
# KDE3Macros.cmake contains all the KDE specific macros
INCLUDE(KDE3Macros)
diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake
index 3d32fcc..bd69296 100644
--- a/Modules/FindKDE4.cmake
+++ b/Modules/FindKDE4.cmake
@@ -20,16 +20,13 @@ FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
# the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
PATH_SUFFIXES bin
- PATHS
+ HINTS
${CMAKE_INSTALL_PREFIX}
${_KDEDIRS}
/opt/kde4
- NO_DEFAULT_PATH
ONLY_CMAKE_FIND_ROOT_PATH
)
-FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ONLY_CMAKE_FIND_ROOT_PATH)
-
IF (NOT KDE4_KDECONFIG_EXECUTABLE)
IF (KDE4_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde4-config")
diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake
index dce4837..a5e8c51 100644
--- a/Modules/FindLua50.cmake
+++ b/Modules/FindLua50.cmake
@@ -13,13 +13,9 @@
FIND_PATH(LUA_INCLUDE_DIR lua.h
- PATHS
+ HINTS
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
-)
-
-FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -29,19 +25,13 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
- PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
)
FIND_LIBRARY(LUA_LIBRARY_lua
NAMES lua50 lua5.0 lua5 lua
- PATHS
+ HINTS
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(LUA_LIBRARY_lua
- NAMES lua50 lua5.0 lua5 lua
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -51,7 +41,6 @@ FIND_LIBRARY(LUA_LIBRARY_lua
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
# In an OS X framework, lualib is usually included as part of the framework
@@ -61,15 +50,10 @@ IF(${LUA_LIBRARY_lua} MATCHES "framework")
ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
FIND_LIBRARY(LUA_LIBRARY_lualib
NAMES lualib50 lualib5.0 lualib5 lualib
- PATHS
+ HINTS
$ENV{LUALIB_DIR}
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
- )
-
- FIND_LIBRARY(LUA_LIBRARY_lualib
- NAMES lualib50 lualib5.0 lualib5 lualib
PATHS
/usr/local
/usr
@@ -77,7 +61,6 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
# include the math library for Unix
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index 3a858bb..04d7db6 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -13,13 +13,9 @@
FIND_PATH(LUA_INCLUDE_DIR lua.h
- PATHS
+ HINTS
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
-)
-
-FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -29,19 +25,13 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
)
FIND_LIBRARY(LUA_LIBRARY
NAMES lua51 lua5.1 lua
- PATHS
+ HINTS
$ENV{LUA_DIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(LUA_LIBRARY
- NAMES lua51 lua5.1 lua
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -51,7 +41,6 @@ FIND_LIBRARY(LUA_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
IF(LUA_LIBRARY)
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 8d2933c..d9cb7c1 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -49,13 +49,9 @@
# CMAKE_INCLUDE_PATH to modify the search paths.
FIND_PATH(OPENAL_INCLUDE_DIR al.h
- PATHS
+ HINTS
$ENV{OPENALDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include/AL include/OpenAL include
-)
-
-FIND_PATH(OPENAL_INCLUDE_DIR al.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -66,19 +62,13 @@ FIND_PATH(OPENAL_INCLUDE_DIR al.h
/opt/csw # Blastwave
/opt
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
- PATH_SUFFIXES include/AL include/OpenAL include
)
FIND_LIBRARY(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32
- PATHS
+ HINTS
$ENV{OPENALDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
-)
-
-FIND_LIBRARY(OPENAL_LIBRARY
- NAMES OpenAL al openal OpenAL32
+ PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -89,7 +79,6 @@ FIND_LIBRARY(OPENAL_LIBRARY
/opt/csw
/opt
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
)
diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake
index fc5cd36..75fdbdd 100644
--- a/Modules/FindOpenThreads.cmake
+++ b/Modules/FindOpenThreads.cmake
@@ -39,7 +39,7 @@
# Explicit -DVAR=value arguments should still be able to override everything.
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
- PATHS
+ HINTS
$ENV{OPENTHREADS_INCLUDE_DIR}
$ENV{OPENTHREADS_DIR}/include
$ENV{OPENTHREADS_DIR}
@@ -48,12 +48,7 @@ FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
$ENV{OSG_DIR}
$ENV{OSGDIR}/include
$ENV{OSGDIR}
- NO_DEFAULT_PATH
-)
-
-
-
-FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+ PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include
@@ -69,7 +64,7 @@ FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
- PATHS
+ HINTS
$ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}/lib64
$ENV{OPENTHREADS_DIR}/lib
@@ -81,13 +76,6 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
$ENV{OSGDIR}/lib64
$ENV{OSGDIR}/lib
$ENV{OSGDIR}
- NO_DEFAULT_PATH
-)
-
-
-
-FIND_LIBRARY(OPENTHREADS_LIBRARY
- NAMES OpenThreads OpenThreadsWin32
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -110,7 +98,7 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
- PATHS
+ HINTS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
$ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}/lib64
@@ -123,13 +111,6 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
$ENV{OSGDIR}/lib64
$ENV{OSGDIR}/lib
$ENV{OSGDIR}
- NO_DEFAULT_PATH
-)
-
-
-
-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
- NAMES OpenThreadsd OpenThreadsWin32d
PATHS
/usr/local/lib64
/usr/local/lib
diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake
index 93e3b99..443ce38 100644
--- a/Modules/FindPhysFS.cmake
+++ b/Modules/FindPhysFS.cmake
@@ -11,13 +11,9 @@
# Created by Eric Wing.
FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
- PATHS
+ HINTS
$ENV{PHYSFSDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES include
-)
-
-FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
+ PATH_SUFFIXES include/physfs include
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -27,19 +23,13 @@ FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
- PATH_SUFFIXES include/physfs include
)
FIND_LIBRARY(PHYSFS_LIBRARY
NAMES physfs
- PATHS
+ HINTS
$ENV{PHYSFSDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(PHYSFS_LIBRARY
- NAMES physfs
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -49,7 +39,6 @@ FIND_LIBRARY(PHYSFS_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(PHYSFS_FOUND "NO")
diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake
index 576eae2..db51d3a 100644
--- a/Modules/FindProducer.cmake
+++ b/Modules/FindProducer.cmake
@@ -30,15 +30,11 @@
# Try the user's environment request before anything else.
FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
- PATHS
+ HINTS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -54,16 +50,11 @@ FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
FIND_LIBRARY(PRODUCER_LIBRARY
NAMES Producer
- PATHS
+ HINTS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(PRODUCER_LIBRARY
- NAMES Producer
+ PATH_SUFFIXES lib64 lib
PATHS
/usr/local
/usr
@@ -71,7 +62,6 @@ FIND_LIBRARY(PRODUCER_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(PRODUCER_FOUND "NO")
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 14c0ac4..658d7ec 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -122,13 +122,8 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_MOC_EXECUTABLE
NAMES moc moc-qt3
- PATHS
+ HINTS
$ENV{QTDIR}/bin
- NO_DEFAULT_PATH
-)
-
-FIND_PROGRAM(QT_MOC_EXECUTABLE
- NAMES moc moc-qt3
PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
@@ -150,15 +145,12 @@ ENDIF(QT_MOC_EXECUTABLE)
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_UIC_EXECUTABLE uic
- PATHS
+ HINTS
$ENV{QTDIR}/bin
- NO_DEFAULT_PATH
-)
-FIND_PROGRAM(QT_UIC_EXECUTABLE uic
+ PATHS
"[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.1.0;InstallDir]/include/Qt"
- $ENV{QTDIR}/bin
${GLOB_PATHS_BIN}
/usr/local/qt/bin
/usr/lib/qt/bin
diff --git a/Modules/FindQuickTime.cmake b/Modules/FindQuickTime.cmake
index 00bc3ec..5a4a580 100644
--- a/Modules/FindQuickTime.cmake
+++ b/Modules/FindQuickTime.cmake
@@ -17,20 +17,15 @@ IF(APPLE)
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
ELSE(APPLE)
FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
+ HINTS
$ENV{QUICKTIME_DIR}/include
$ENV{QUICKTIME_DIR}
- NO_DEFAULT_PATH
)
-
- FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)
-
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
+ HINTS
$ENV{QUICKTIME_DIR}/lib
$ENV{QUICKTIME_DIR}
- NO_DEFAULT_PATH
)
-
- FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
ENDIF(APPLE)
SET(QUICKTIME_FOUND "NO")
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 75b42cc..ee880a6 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -53,13 +53,9 @@
# reasons because not all systems place things in SDL/ (see FreeBSD).
FIND_PATH(SDL_INCLUDE_DIR SDL.h
- PATHS
+ HINTS
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(SDL_INCLUDE_DIR SDL.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -86,14 +82,9 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h
# don't confuse it for the version number.
FIND_LIBRARY(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
- PATHS
+ HINTS
$ENV{SDLDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(SDL_LIBRARY_TEMP
- NAMES SDL SDL-1.1
+ PATH_SUFFIXES lib64 lib
PATHS
/usr/local
/usr
@@ -101,7 +92,6 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
@@ -114,14 +104,9 @@ IF(NOT SDL_BUILDING_LIBRARY)
# necessarily need it.
FIND_LIBRARY(SDLMAIN_LIBRARY
NAMES SDLmain SDLmain-1.1
- PATHS
+ HINTS
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
- )
-
- FIND_LIBRARY(SDLMAIN_LIBRARY
- NAMES SDLmain SDLmain-1.1
PATHS
/usr/local
/usr
@@ -129,7 +114,6 @@ IF(NOT SDL_BUILDING_LIBRARY)
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
ENDIF(NOT SDL_BUILDING_LIBRARY)
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
index e39b3cb..e2481e1 100644
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@@ -13,14 +13,10 @@
# additional Unix paths (FreeBSD, etc).
FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
- PATHS
+ HINTS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -44,15 +40,10 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
FIND_LIBRARY(SDLIMAGE_LIBRARY
NAMES SDL_image
- PATHS
+ HINTS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(SDLIMAGE_LIBRARY
- NAMES SDL_image
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -62,7 +53,6 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(SDLIMAGE_FOUND "NO")
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index 59b0f5a..720a17a 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -13,14 +13,10 @@
# additional Unix paths (FreeBSD, etc).
FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
- PATHS
+ HINTS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -44,15 +40,10 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
FIND_LIBRARY(SDLMIXER_LIBRARY
NAMES SDL_mixer
- PATHS
+ HINTS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(SDLMIXER_LIBRARY
- NAMES SDL_mixer
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -62,7 +53,6 @@ FIND_LIBRARY(SDLMIXER_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(SDLMIXER_FOUND "NO")
diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake
index 8d0ce8a..6de1946 100644
--- a/Modules/FindSDL_net.cmake
+++ b/Modules/FindSDL_net.cmake
@@ -14,14 +14,10 @@
FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
- PATHS
+ HINTS
$ENV{SDLNETDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -44,15 +40,10 @@ FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
)
FIND_LIBRARY(SDLNET_LIBRARY
NAMES SDL_net
- PATHS
+ HINTS
$ENV{SDLNETDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(SDLNET_LIBRARY
- NAMES SDL_net
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -62,7 +53,6 @@ FIND_LIBRARY(SDLNET_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(SDLNET_FOUND "NO")
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 71d7334..21d6b1c 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -62,16 +62,12 @@ MARK_AS_ADVANCED(SDL_SOUND_EXTRAS)
# Find SDL_sound.h
FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
+ HINTS
$ENV{SDLSOUNDDIR}/include
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/include
$ENV{SDLDIR}
- NO_DEFAULT_PATH
-)
-FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
- NO_DEFAULT_PATH
-)
-FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
+ PATHS
/usr/local/include/SDL
/usr/include/SDL
/usr/local/include/SDL12
@@ -92,11 +88,12 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
FIND_LIBRARY(SDL_SOUND_LIBRARY
NAMES SDL_sound
- PATHS
+ HINTS
$ENV{SDLSOUNDDIR}/lib
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
+ PATHS
/usr/local/lib
/usr/lib
/sw/lib
diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
index e1113d6..20d3e5a 100644
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@@ -12,16 +12,11 @@
# module, but with modifications to recognize OS X frameworks and
# additional Unix paths (FreeBSD, etc).
-
FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
- PATHS
+ HINTS
$ENV{SDLTTFDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -45,15 +40,9 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
FIND_LIBRARY(SDLTTF_LIBRARY
NAMES SDL_ttf
- PATHS
+ HINTS
$ENV{SDLTTFDIR}
$ENV{SDLDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(SDLTTF_LIBRARY
- NAMES SDL_ttf
PATHS
~/Library/Frameworks
/Library/Frameworks
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 3810609..568ab0e 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -174,22 +174,12 @@ ENDIF(WIN32)
FIND_PATH(TCL_INCLUDE_PATH
NAMES tcl.h
- PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
- NO_DEFAULT_PATH
- )
-FIND_PATH(TCL_INCLUDE_PATH
- NAMES tcl.h
- PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+ HINTS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
FIND_PATH(TK_INCLUDE_PATH
NAMES tk.h
- PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
- NO_DEFAULT_PATH
- )
-FIND_PATH(TK_INCLUDE_PATH
- NAMES tk.h
- PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+ HINTS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake
index d2cc86b..129c11a 100644
--- a/Modules/FindTclsh.cmake
+++ b/Modules/FindTclsh.cmake
@@ -66,11 +66,7 @@ SET(TCL_TCLSH_NAMES
FIND_PROGRAM(TCL_TCLSH
NAMES ${TCL_TCLSH_NAMES}
- PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
- )
-FIND_PROGRAM(TCL_TCLSH
- NAMES ${TCL_TCLSH_NAMES}
- PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
+ HINTS ${TCLTK_POSSIBLE_BIN_PATHS}
)
# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake
index 86e9c67..0afd3c9 100644
--- a/Modules/FindWish.cmake
+++ b/Modules/FindWish.cmake
@@ -65,11 +65,7 @@ SET(TK_WISH_NAMES
FIND_PROGRAM(TK_WISH
NAMES ${TK_WISH_NAMES}
- PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
- )
-FIND_PROGRAM(TK_WISH
- NAMES ${TK_WISH_NAMES}
- PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
+ HINTS ${TCLTK_POSSIBLE_BIN_PATHS}
)
MARK_AS_ADVANCED(TK_WISH)
diff --git a/Modules/FindXMLRPC.cmake b/Modules/FindXMLRPC.cmake
index 2e8f1ad..2eefd2f 100644
--- a/Modules/FindXMLRPC.cmake
+++ b/Modules/FindXMLRPC.cmake
@@ -101,10 +101,8 @@ IF(XMLRPC_FOUND)
# Look for this library.
FIND_LIBRARY(XMLRPC_${name}_LIBRARY
NAMES ${name}
- PATHS ${XMLRPC_LIBRARY_DIRS}
- NO_DEFAULT_PATH
+ HINTS ${XMLRPC_LIBRARY_DIRS}
)
- FIND_LIBRARY(XMLRPC_${name}_LIBRARY NAMES ${name})
MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY)
# If any library is not found then the whole package is not found.
diff --git a/Modules/Findosg.cmake b/Modules/Findosg.cmake
index 1a4598c..7804bae 100644
--- a/Modules/Findosg.cmake
+++ b/Modules/Findosg.cmake
@@ -27,14 +27,10 @@
# Try the user's environment request before anything else.
FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
- PATHS
+ HINTS
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -46,20 +42,14 @@ FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSG_LIBRARY
NAMES osg
- PATHS
+ HINTS
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSG_LIBRARY
- NAMES osg
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -69,7 +59,6 @@ FIND_LIBRARY(OSG_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSG_FOUND "NO")
diff --git a/Modules/FindosgDB.cmake b/Modules/FindosgDB.cmake
index 711e5f3..88da807 100644
--- a/Modules/FindosgDB.cmake
+++ b/Modules/FindosgDB.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
- PATHS
+ HINTS
$ENV{OSGDB_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGDB_LIBRARY
NAMES osgDB
- PATHS
+ HINTS
$ENV{OSGDB_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGDB_LIBRARY
- NAMES osgDB
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGDB_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGDB_FOUND "NO")
diff --git a/Modules/FindosgFX.cmake b/Modules/FindosgFX.cmake
index cc1c3a6..9b45c31 100644
--- a/Modules/FindosgFX.cmake
+++ b/Modules/FindosgFX.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
- PATHS
+ HINTS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGFX_LIBRARY
NAMES osgFX
- PATHS
+ HINTS
$ENV{OSGFX_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGFX_LIBRARY
- NAMES osgFX
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGFX_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGFX_FOUND "NO")
diff --git a/Modules/FindosgGA.cmake b/Modules/FindosgGA.cmake
index a9dc863..c1585d0 100644
--- a/Modules/FindosgGA.cmake
+++ b/Modules/FindosgGA.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
- PATHS
+ HINTS
$ENV{OSGGA_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGGA_LIBRARY
NAMES osgGA
- PATHS
+ HINTS
$ENV{OSGGA_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGGA_LIBRARY
- NAMES osgGA
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGGA_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGGA_FOUND "NO")
diff --git a/Modules/FindosgIntrospection.cmake b/Modules/FindosgIntrospection.cmake
index 270f5f8..cf7ffac 100644
--- a/Modules/FindosgIntrospection.cmake
+++ b/Modules/FindosgIntrospection.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
- PATHS
+ HINTS
$ENV{OSGINTROSPECTION_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
NAMES osgIntrospection
- PATHS
+ HINTS
$ENV{OSGINTROSPECTION_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
- NAMES osgIntrospection
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGINTROSPECTION_FOUND "NO")
diff --git a/Modules/FindosgManipulator.cmake b/Modules/FindosgManipulator.cmake
index f76e727..17a6424 100644
--- a/Modules/FindosgManipulator.cmake
+++ b/Modules/FindosgManipulator.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
- PATHS
+ HINTS
$ENV{OSGMANIPULATOR_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
NAMES osgManipulator
- PATHS
+ HINTS
$ENV{OSGMANIPULATOR_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
- NAMES osgManipulator
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGMANIPULATOR_FOUND "NO")
diff --git a/Modules/FindosgParticle.cmake b/Modules/FindosgParticle.cmake
index a6b4bf9..8514b2f 100644
--- a/Modules/FindosgParticle.cmake
+++ b/Modules/FindosgParticle.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
- PATHS
+ HINTS
$ENV{OSGPARTICLE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGPARTICLE_LIBRARY
NAMES osgParticle
- PATHS
+ HINTS
$ENV{OSGPARTICLE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGPARTICLE_LIBRARY
- NAMES osgParticle
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGPARTICLE_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGPARTICLE_FOUND "NO")
diff --git a/Modules/FindosgProducer.cmake b/Modules/FindosgProducer.cmake
index 7ff3292..0852527 100644
--- a/Modules/FindosgProducer.cmake
+++ b/Modules/FindosgProducer.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
- PATHS
+ HINTS
$ENV{OSGPRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGPRODUCER_LIBRARY
NAMES osgProducer
- PATHS
+ HINTS
$ENV{OSGPRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGPRODUCER_LIBRARY
- NAMES osgProducer
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGPRODUCER_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGPRODUCER_FOUND "NO")
diff --git a/Modules/FindosgShadow.cmake b/Modules/FindosgShadow.cmake
index 65a2336..ddb59fb 100644
--- a/Modules/FindosgShadow.cmake
+++ b/Modules/FindosgShadow.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
- PATHS
+ HINTS
$ENV{OSGSHADOW_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGSHADOW_LIBRARY
NAMES osgShadow
- PATHS
+ HINTS
$ENV{OSGSHADOW_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGSHADOW_LIBRARY
- NAMES osgShadow
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGSHADOW_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGSHADOW_FOUND "NO")
diff --git a/Modules/FindosgSim.cmake b/Modules/FindosgSim.cmake
index 4bff328..1293af7 100644
--- a/Modules/FindosgSim.cmake
+++ b/Modules/FindosgSim.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
- PATHS
+ HINTS
$ENV{OSGSIM_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGSIM_LIBRARY
NAMES osgSim
- PATHS
+ HINTS
$ENV{OSGSIM_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGSIM_LIBRARY
- NAMES osgSim
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGSIM_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGSIM_FOUND "NO")
diff --git a/Modules/FindosgTerrain.cmake b/Modules/FindosgTerrain.cmake
index fcf7489..3f3a559 100644
--- a/Modules/FindosgTerrain.cmake
+++ b/Modules/FindosgTerrain.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
- PATHS
+ HINTS
$ENV{OSGTERRAIN_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGTERRAIN_LIBRARY
NAMES osgTerrain
- PATHS
+ HINTS
$ENV{OSGTERRAIN_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGTERRAIN_LIBRARY
- NAMES osgTerrain
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGTERRAIN_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGTERRAIN_FOUND "NO")
diff --git a/Modules/FindosgText.cmake b/Modules/FindosgText.cmake
index d6c3e1f..7eef2a1 100644
--- a/Modules/FindosgText.cmake
+++ b/Modules/FindosgText.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
- PATHS
+ HINTS
$ENV{OSGTEXT_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGTEXT_LIBRARY
NAMES osgText
- PATHS
+ HINTS
$ENV{OSGTEXT_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGTEXT_LIBRARY
- NAMES osgText
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGTEXT_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGTEXT_FOUND "NO")
diff --git a/Modules/FindosgUtil.cmake b/Modules/FindosgUtil.cmake
index cbd9b8c..f73d82b 100644
--- a/Modules/FindosgUtil.cmake
+++ b/Modules/FindosgUtil.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
- PATHS
+ HINTS
$ENV{OSGUTIL_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGUTIL_LIBRARY
NAMES osgUtil
- PATHS
+ HINTS
$ENV{OSGUTIL_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGUTIL_LIBRARY
- NAMES osgUtil
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGUTIL_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGUTIL_FOUND "NO")
diff --git a/Modules/FindosgViewer.cmake b/Modules/FindosgViewer.cmake
index b9efd47..d240a8c 100644
--- a/Modules/FindosgViewer.cmake
+++ b/Modules/FindosgViewer.cmake
@@ -27,15 +27,11 @@
# Try the user's environment request before anything else.
FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
- PATHS
+ HINTS
$ENV{OSGVIEWER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
PATH_SUFFIXES include
-)
-
-FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -47,21 +43,15 @@ FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
- PATH_SUFFIXES include
)
FIND_LIBRARY(OSGVIEWER_LIBRARY
NAMES osgViewer
- PATHS
+ HINTS
$ENV{OSGVIEWER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(OSGVIEWER_LIBRARY
- NAMES osgViewer
+ PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -71,7 +61,6 @@ FIND_LIBRARY(OSGVIEWER_LIBRARY
/opt/local
/opt/csw
/opt
- PATH_SUFFIXES lib64 lib
)
SET(OSGVIEWER_FOUND "NO")
--
cgit v0.12