ENH: use program files env for searching
This commit is contained in:
parent
7db64cdb28
commit
7603244509
|
@ -2,6 +2,7 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
|
|||
NAMES devenv
|
||||
PATHS
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VS;EnvironmentDirectory]
|
||||
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
|
||||
"c:/Program Files/Microsoft Visual Studio .NET/Common7/IDE"
|
||||
"c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE"
|
||||
"/Program Files/Microsoft Visual Studio .NET/Common7/IDE/"
|
||||
|
|
|
@ -3,6 +3,7 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
|
|||
PATHS
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path]
|
||||
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
|
||||
"c:/Program Files/Microsoft Visual Studio 8/Common7/IDE"
|
||||
"c:/Program Files/Microsoft Visual Studio8/Common7/IDE"
|
||||
"/Program Files/Microsoft Visual Studio 8/Common7/IDE/"
|
||||
|
|
|
@ -7,7 +7,8 @@ FIND_PATH(DART_ROOT README.INSTALL
|
|||
$ENV{DART_ROOT}
|
||||
${PROJECT_SOURCE_DIR}/Dart
|
||||
/usr/share/Dart
|
||||
C:/Dart
|
||||
C:/Dart
|
||||
"$ENV{ProgramFiles}/Dart"
|
||||
"C:/Program Files/Dart"
|
||||
${PROJECT_SOURCE_DIR}/../Dart
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Dart\\InstallPath]
|
||||
|
|
|
@ -15,6 +15,7 @@ FIND_PROGRAM(DOXYGEN
|
|||
# which contains dot in its bundle.
|
||||
FIND_PROGRAM(DOT
|
||||
dot
|
||||
"$ENV{ProgramFiles}/ATT/Graphviz/bin"
|
||||
"C:/Program Files/ATT/Graphviz/bin"
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
|
||||
/Applications/Graphviz.app/Contents/MacOS
|
||||
|
|
|
@ -3,5 +3,6 @@ FIND_PROGRAM(GCCXML
|
|||
NAMES gccxml
|
||||
../GCC_XML/gccxml
|
||||
PATHS [HKEY_CURRENT_USER\\Software\\Kitware\\GCC_XML;loc]
|
||||
"C:/Program Files/GCC_XML"
|
||||
"$ENV{ProgramFiles}/GCC_XML"
|
||||
"C:/Program Files/GCC_XML"
|
||||
)
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# - This module looks for Microsoft HTML Help Compiler
|
||||
# It defines:
|
||||
# HTML_HELP_COMPILER - path to the Compiler hhc.exe
|
||||
# HTML_HELP_INCLUDE_PATH - include path for htmlhelp.h
|
||||
# HTML_HELP_LIBRARY - path to the library htmlhelp.lib
|
||||
# HTML_HELP_COMPILER : full path to the Compiler (hhc.exe)
|
||||
# HTML_HELP_INCLUDE_PATH : include path to the API (htmlhelp.h)
|
||||
# HTML_HELP_LIBRARY : full path to the library (htmlhelp.lib)
|
||||
#
|
||||
|
||||
IF (WIN32)
|
||||
|
@ -10,6 +10,7 @@ IF (WIN32)
|
|||
FIND_PROGRAM (HTML_HELP_COMPILER
|
||||
hhc
|
||||
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]"
|
||||
"$ENV{ProgramFiles}/HTML Help Workshop"
|
||||
"C:/Program Files/HTML Help Workshop"
|
||||
)
|
||||
|
||||
|
@ -19,6 +20,7 @@ IF (WIN32)
|
|||
htmlhelp.h
|
||||
"${HTML_HELP_COMPILER_PATH}/include"
|
||||
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/include"
|
||||
"$ENV{ProgramFiles}/HTML Help Workshop/include"
|
||||
"C:/Program Files/HTML Help Workshop/include"
|
||||
)
|
||||
|
||||
|
@ -26,6 +28,7 @@ IF (WIN32)
|
|||
htmlhelp
|
||||
"${HTML_HELP_COMPILER_PATH}/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/lib"
|
||||
"$ENV{ProgramFiles}/HTML Help Workshop/lib"
|
||||
"C:/Program Files/HTML Help Workshop/lib"
|
||||
)
|
||||
|
||||
|
|
|
@ -9,18 +9,21 @@ FIND_PATH(MPI_INCLUDE_PATH mpi.h
|
|||
/usr/include
|
||||
/usr/include/mpi
|
||||
/usr/local/mpi/include
|
||||
"$ENV{ProgramFiles}/MPICH/SDK/Include"
|
||||
"C:/Program Files/MPICH/SDK/Include"
|
||||
)
|
||||
|
||||
FIND_LIBRARY(MPI_LIBRARY
|
||||
NAMES mpi mpich
|
||||
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
|
||||
"$ENV{ProgramFiles}/MPICH/SDK/Lib"
|
||||
"C:/Program Files/MPICH/SDK/Lib"
|
||||
)
|
||||
|
||||
FIND_LIBRARY(MPI_EXTRA_LIBRARY
|
||||
NAMES mpi++
|
||||
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
|
||||
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
|
||||
"$ENV{ProgramFiles}/MPICH/SDK/Lib"
|
||||
"C:/Program Files/MPICH/SDK/Lib"
|
||||
DOC "If a second mpi library is necessary, specify it here.")
|
||||
|
||||
|
|
|
@ -154,9 +154,10 @@ ENDIF(QT_UIC_EXECUTABLE)
|
|||
|
||||
IF (WIN32)
|
||||
FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
|
||||
"$ENV{ProgramFiles}/qt/lib"
|
||||
$ENV{QTDIR}/lib "C:/Program Files/qt/lib"
|
||||
DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
|
||||
)
|
||||
|
|
|
@ -196,6 +196,7 @@ IF(QT4_QMAKE_FOUND)
|
|||
/usr/lib/qt/include/Qt
|
||||
/usr/include/Qt
|
||||
/usr/share/qt4/include/Qt
|
||||
"$ENV{ProgramFiles}/qt/include/Qt"
|
||||
"C:/Program Files/qt/include/Qt"
|
||||
/usr/include/qt4/Qt)
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@ SET (TCLTK_POSSIBLE_LIB_PATHS
|
|||
"${TK_WISH_PATH}/../lib"
|
||||
"${TCL_INCLUDE_PATH}/../lib"
|
||||
"${TK_INCLUDE_PATH}/../lib"
|
||||
"$ENV{ProgramFiles}/Tcl/Lib"
|
||||
"C:/Program Files/Tcl/lib"
|
||||
"C:/Tcl/lib"
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib
|
||||
|
@ -112,6 +113,7 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
|||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include
|
||||
"$ENV{ProgramFiles}/Tcl/include"
|
||||
"C:/Program Files/Tcl/include"
|
||||
C:/Tcl/include
|
||||
/usr/include
|
||||
|
|
|
@ -37,3 +37,12 @@ SET(CMAKE_C_CREATE_SHARED_MODULE
|
|||
|
||||
|
||||
SET(CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES /usr/local/include)
|
||||
# default to searching for frameworks first
|
||||
SET(CMAKE_FIND_FRAMEWORK FIRST)
|
||||
# set up the default search directories for frameworks
|
||||
SET(CMAKE_SYSTEM_FRAMEWORK_PATH
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks;/Network
|
||||
/Network/Library/Frameworks
|
||||
/System/Library/Frameworks)
|
||||
|
||||
|
|
Loading…
Reference in New Issue