Commit b04650e1 authored by Rolf Eike Beer's avatar Rolf Eike Beer
Browse files

use the find_* functions ENV parameter

Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR.
This will make sure the paths will get correctly handled through different
platforms, especially on Windows.

Also fixes one place where paths with windows delimiters (\) were hardcoded to
use forward slashes.
parent cd3bd232
......@@ -650,9 +650,11 @@ endif()
# 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
find_path(CUDA_SDK_ROOT_DIR common/inc/cutil.h
HINTS
"$ENV{NVSDKCOMPUTE_ROOT}/C"
"$ENV{NVSDKCUDA_ROOT}"
ENV NVSDKCUDA_ROOT
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]"
PATHS
"/Developer/GPU\ Computing/C"
)
......
......@@ -17,7 +17,9 @@
# License text for the above reference.)
find_path(DART_ROOT README.INSTALL
$ENV{DART_ROOT}
HINTS
ENV DART_ROOT
PATHS
${PROJECT_SOURCE_DIR}/Dart
/usr/share/Dart
C:/Dart
......
......@@ -93,11 +93,13 @@ if(NOT FLTK_DIR)
#
find_path(FLTK_DIR FLTKConfig.cmake
# Look for an environment variable FLTK_DIR.
$ENV{FLTK_DIR}
HINTS
ENV FLTK_DIR
# Look in places relative to the system executable search path.
${FLTK_DIR_SEARCH}
PATHS
# Look in standard UNIX install locations.
/usr/local/lib/fltk
/usr/lib/fltk
......
......@@ -73,7 +73,7 @@ if(NOT FLTK2_DIR)
#
find_path(FLTK2_DIR FLTK2Config.cmake
# Look for an environment variable FLTK2_DIR.
$ENV{FLTK2_DIR}
ENV FLTK2_DIR
# Look in places relative to the system executable search path.
${FLTK2_DIR_SEARCH}
......
......@@ -44,7 +44,7 @@
# everything still works.
find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
HINTS
$ENV{FREETYPE_DIR}
ENV FREETYPE_DIR
PATHS
/usr/local/X11R6/include
/usr/local/X11/include
......@@ -64,7 +64,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
find_library(FREETYPE_LIBRARY
NAMES freetype libfreetype freetype219
HINTS
$ENV{FREETYPE_DIR}
ENV FREETYPE_DIR
PATH_SUFFIXES lib64 lib
PATHS
/usr/local/X11R6
......
......@@ -42,8 +42,8 @@
find_path(GDAL_INCLUDE_DIR gdal.h
HINTS
$ENV{GDAL_DIR}
$ENV{GDAL_ROOT}
ENV GDAL_DIR
ENV GDAL_ROOT
PATH_SUFFIXES
include/gdal
include/GDAL
......@@ -64,8 +64,8 @@ if(UNIX)
# libgdal.so...
find_program(GDAL_CONFIG gdal-config
HINTS
$ENV{GDAL_DIR}
$ENV{GDAL_ROOT}
ENV GDAL_DIR
ENV GDAL_ROOT
PATH_SUFFIXES bin
PATHS
/sw # Fink
......@@ -88,8 +88,8 @@ endif()
find_library(GDAL_LIBRARY
NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
HINTS
$ENV{GDAL_DIR}
$ENV{GDAL_ROOT}
ENV GDAL_DIR
ENV GDAL_ROOT
${_gdal_libpath}
PATH_SUFFIXES lib64 lib
PATHS
......
......@@ -28,7 +28,7 @@
find_path(GIF_INCLUDE_DIR gif_lib.h
HINTS
$ENV{GIF_DIR}
ENV GIF_DIR
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
......@@ -41,7 +41,7 @@ set(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib giflib4)
find_library(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS}
HINTS
$ENV{GIF_DIR}
ENV GIF_DIR
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
......
......@@ -98,7 +98,7 @@ function(_gtest_find_library _name)
find_library(${_name}
NAMES ${ARGN}
HINTS
$ENV{GTEST_ROOT}
ENV GTEST_ROOT
${GTEST_ROOT}
PATH_SUFFIXES ${_gtest_libpath_suffixes}
)
......
......@@ -26,7 +26,7 @@
find_path(LUA_INCLUDE_DIR lua.h
HINTS
$ENV{LUA_DIR}
ENV LUA_DIR
PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
PATHS
~/Library/Frameworks
......@@ -40,7 +40,7 @@ find_path(LUA_INCLUDE_DIR lua.h
find_library(LUA_LIBRARY_lua
NAMES lua50 lua5.0 lua-5.0 lua5 lua
HINTS
$ENV{LUA_DIR}
ENV LUA_DIR
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
......@@ -59,8 +59,8 @@ else()
find_library(LUA_LIBRARY_lualib
NAMES lualib50 lualib5.0 lualib5 lualib
HINTS
$ENV{LUALIB_DIR}
$ENV{LUA_DIR}
ENV LUALIB_DIR
ENV LUA_DIR
PATH_SUFFIXES lib64 lib
PATHS
/sw
......
......@@ -27,7 +27,7 @@
find_path(LUA_INCLUDE_DIR lua.h
HINTS
$ENV{LUA_DIR}
ENV LUA_DIR
PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
PATHS
~/Library/Frameworks
......@@ -41,7 +41,7 @@ find_path(LUA_INCLUDE_DIR lua.h
find_library(LUA_LIBRARY
NAMES lua51 lua5.1 lua-5.1 lua
HINTS
$ENV{LUA_DIR}
ENV LUA_DIR
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
......
......@@ -63,7 +63,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
$ENV{OPENALDIR}
ENV OPENALDIR
PATH_SUFFIXES include/AL include/OpenAL include
PATHS
~/Library/Frameworks
......@@ -78,7 +78,7 @@ find_path(OPENAL_INCLUDE_DIR al.h
find_library(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32
HINTS
$ENV{OPENALDIR}
ENV OPENALDIR
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS
~/Library/Frameworks
......
......@@ -54,13 +54,13 @@
find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS
# enough environment variables?
$ENV{OPENTHREADS_INCLUDE_DIR}
$ENV{OPENTHREADS_DIR}
$ENV{OSG_INCLUDE_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
ENV OPENTHREADS_INCLUDE_DIR
ENV OPENTHREADS_DIR
ENV OSG_INCLUDE_DIR
ENV OSG_DIR
ENV OSGDIR
ENV OpenThreads_ROOT
ENV OSG_ROOT
PATHS
/sw # Fink
/opt/local # DarwinPorts
......@@ -74,13 +74,13 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
find_library(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
HINTS
$ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}
$ENV{OSG_LIBRARY_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
ENV OPENTHREADS_LIBRARY_DIR
ENV OPENTHREADS_DIR
ENV OSG_LIBRARY_DIR
ENV OSG_DIR
ENV OSGDIR
ENV OpenThreads_ROOT
ENV OSG_ROOT
PATHS
/sw
/opt/local
......@@ -93,14 +93,14 @@ find_library(OPENTHREADS_LIBRARY
find_library(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
HINTS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
$ENV{OPENTHREADS_LIBRARY_DIR}
$ENV{OPENTHREADS_DIR}
$ENV{OSG_LIBRARY_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
ENV OPENTHREADS_DEBUG_LIBRARY_DIR
ENV OPENTHREADS_LIBRARY_DIR
ENV OPENTHREADS_DIR
ENV OSG_LIBRARY_DIR
ENV OSG_DIR
ENV OSGDIR
ENV OpenThreads_ROOT
ENV OSG_ROOT
PATHS
/sw
/opt/local
......
......@@ -25,7 +25,7 @@
find_path(PHYSFS_INCLUDE_DIR physfs.h
HINTS
$ENV{PHYSFSDIR}
ENV PHYSFSDIR
PATH_SUFFIXES include/physfs include
PATHS
~/Library/Frameworks
......@@ -39,7 +39,7 @@ find_path(PHYSFS_INCLUDE_DIR physfs.h
find_library(PHYSFS_LIBRARY
NAMES physfs
HINTS
$ENV{PHYSFSDIR}
ENV PHYSFSDIR
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
......
......@@ -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_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}
"9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
......@@ -89,7 +84,7 @@ if ( WIN32 )
endforeach()
endif()
set( PostgreSQL_ROOT_DIRECTORIES
${PostgreSQL_ROOT_DIRECTORIES}
ENV PostgreSQL_ROOT
${PostgreSQL_ROOT}
${PostgreSQL_ADDITIONAL_SEARCH_PATHS}
)
......
......@@ -44,9 +44,9 @@
# Try the user's environment request before anything else.
find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup
HINTS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
ENV PRODUCER_DIR
ENV OSG_DIR
ENV OSGDIR
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
......@@ -62,9 +62,9 @@ find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup
find_library(PRODUCER_LIBRARY
NAMES Producer
HINTS
$ENV{PRODUCER_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
ENV PRODUCER_DIR
ENV OSG_DIR
ENV OSGDIR
PATH_SUFFIXES lib64 lib
PATHS
/sw
......
......@@ -32,12 +32,12 @@ else()
find_path(QUICKTIME_INCLUDE_DIR QuickTime.h
HINTS
$ENV{QUICKTIME_DIR}/include
$ENV{QUICKTIME_DIR}
ENV QUICKTIME_DIR
)
find_library(QUICKTIME_LIBRARY QuickTime
HINTS
$ENV{QUICKTIME_DIR}/lib
$ENV{QUICKTIME_DIR}
ENV QUICKTIME_DIR
)
endif()
......
......@@ -35,18 +35,13 @@ macro(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
endif()
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")
# Detect the CERTI installation, http://www.cert.fr/CERTI
# 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
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\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 3.2-win32-msvc++8.0;InstallLocation]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]"
......
......@@ -67,7 +67,7 @@
find_path(SDL_INCLUDE_DIR SDL.h
HINTS
$ENV{SDLDIR}
ENV SDLDIR
PATH_SUFFIXES include/SDL include
PATHS
~/Library/Frameworks
......@@ -87,7 +87,7 @@ find_path(SDL_INCLUDE_DIR SDL.h
find_library(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
HINTS
$ENV{SDLDIR}
ENV SDLDIR
PATH_SUFFIXES lib64 lib
PATHS
/sw
......@@ -105,7 +105,7 @@ if(NOT SDL_BUILDING_LIBRARY)
find_library(SDLMAIN_LIBRARY
NAMES SDLmain SDLmain-1.1
HINTS
$ENV{SDLDIR}
ENV SDLDIR
PATH_SUFFIXES lib64 lib
PATHS
/sw
......
......@@ -27,8 +27,8 @@
find_path(SDLIMAGE_INCLUDE_DIR SDL_image.h
HINTS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
ENV SDLIMAGEDIR
ENV SDLDIR
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
......@@ -52,8 +52,8 @@ find_path(SDLIMAGE_INCLUDE_DIR SDL_image.h
find_library(SDLIMAGE_LIBRARY
NAMES SDL_image
HINTS
$ENV{SDLIMAGEDIR}
$ENV{SDLDIR}
ENV SDLIMAGEDIR
ENV SDLDIR
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
......
......@@ -27,8 +27,8 @@
find_path(SDLMIXER_INCLUDE_DIR SDL_mixer.h
HINTS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
ENV SDLMIXERDIR
ENV SDLDIR
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
......@@ -52,8 +52,8 @@ find_path(SDLMIXER_INCLUDE_DIR SDL_mixer.h
find_library(SDLMIXER_LIBRARY
NAMES SDL_mixer
HINTS
$ENV{SDLMIXERDIR}
$ENV{SDLDIR}
ENV SDLMIXERDIR
ENV SDLDIR
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment