diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-10 15:12:56 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-10 15:12:56 (GMT) |
| commit | c8c3bd7acd88455772f0301062856e0d9622db31 (patch) | |
| tree | fdec66913bf2cccfe2ad889798cd337fb1b35ab7 /Modules | |
| parent | da21bc79bb50059a658c9f7304852b5a307e92a1 (diff) | |
| download | CMake-c8c3bd7acd88455772f0301062856e0d9622db31.zip CMake-c8c3bd7acd88455772f0301062856e0d9622db31.tar.gz CMake-c8c3bd7acd88455772f0301062856e0d9622db31.tar.bz2 | |
ENH: merge from main tree fix for vs all build qt and mpi2
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMPI.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 4 | ||||
| -rw-r--r-- | Modules/readme.txt | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 03f3631..cf39cf6 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -10,13 +10,15 @@ FIND_PATH(MPI_INCLUDE_PATH mpi.h /usr/include/mpi /usr/local/mpi/include "$ENV{ProgramFiles}/MPICH/SDK/Include" + "$ENV{ProgramFiles}/MPICH2/include" "C:/Program Files/MPICH/SDK/Include" ) FIND_LIBRARY(MPI_LIBRARY - NAMES mpi mpich + NAMES mpich2 mpi mpich PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib "$ENV{ProgramFiles}/MPICH/SDK/Lib" + "$ENV{ProgramFiles}/MPICH2/Lib" "C:/Program Files/MPICH/SDK/Lib" ) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 4a401ed..fd0e322 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -560,8 +560,8 @@ IF (QT4_QMAKE_FOUND) ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE ) # Set QT_QTASSISTANT_LIBRARY - FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd QtAssistantClient_debug QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd QtAssistantClientd4 QtAssistantClient_debug QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) # Set QT_QTDESIGNER_LIBRARY FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) diff --git a/Modules/readme.txt b/Modules/readme.txt index 4c31b6b..2e63011 100644 --- a/Modules/readme.txt +++ b/Modules/readme.txt @@ -15,6 +15,9 @@ XXX_VERSION_YY Expect Version YY if true. Make sure at most one of these is eve XXX_WRAP_YY If False, do not try to use the relevent CMake wrapping command. XXX_YY_FOUND If False, optional YY part of XXX sytem is not available. XXX_FOUND Set to false, or undefined, if we haven't found, or don't want to use XXX. +XXX_RUNTIME_LIBRARY_DIRS Optionally, the runtime library search path for use when running an executable linked to shared libraries. + The list should be used by user code to create the PATH on windows or LD_LIBRARY_PATH on unix. + This should not be a cache entry. You do not have to provide all of the above variables. You should provide XXX_FOUND under most circumstances. If XXX is a library, then XXX_LIBRARIES, should also be defined, and XXX_INCLUDE_DIRS should usually be defined (I guess libm.a might be an exception) |