summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Modules/CMakeVS71FindMake.cmake1
-rw-r--r--Modules/CMakeVS8FindMake.cmake1
-rw-r--r--Modules/FindDart.cmake3
-rw-r--r--Modules/FindDoxygen.cmake1
-rw-r--r--Modules/FindGCCXML.cmake3
-rw-r--r--Modules/FindHTMLHelp.cmake9
-rw-r--r--Modules/FindMPI.cmake5
-rw-r--r--Modules/FindQt3.cmake7
-rw-r--r--Modules/FindQt4.cmake1
-rw-r--r--Modules/FindTCL.cmake2
-rw-r--r--Modules/Platform/Darwin.cmake9
11 files changed, 33 insertions, 9 deletions
diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake
index e06e593..ef21887 100644
--- a/Modules/CMakeVS71FindMake.cmake
+++ b/Modules/CMakeVS71FindMake.cmake
@@ -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/"
diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake
index 59d38b1..0a52724 100644
--- a/Modules/CMakeVS8FindMake.cmake
+++ b/Modules/CMakeVS8FindMake.cmake
@@ -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/"
diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake
index 30d8789..35f6eb8 100644
--- a/Modules/FindDart.cmake
+++ b/Modules/FindDart.cmake
@@ -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]
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index d3f705f..6e6531a 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -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
diff --git a/Modules/FindGCCXML.cmake b/Modules/FindGCCXML.cmake
index e0cb838..594f970 100644
--- a/Modules/FindGCCXML.cmake
+++ b/Modules/FindGCCXML.cmake
@@ -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"
)
diff --git a/Modules/FindHTMLHelp.cmake b/Modules/FindHTMLHelp.cmake
index 30d4467..7d9dfb4 100644
--- a/Modules/FindHTMLHelp.cmake
+++ b/Modules/FindHTMLHelp.cmake
@@ -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"
)
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 6851116..03f3631 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -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.")
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 78267ca..6c24779 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -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."
)
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 55ae408..6d1ef9b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -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)
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index a0d5fb0..aca36b5 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -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
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 46374cf..c8dbd87 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -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)
+
generated by cgit v0.12 at 2024-11-11 16:29:12 (GMT)