diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-24 12:37:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-24 12:37:22 (GMT) |
| commit | 5b9b141ee60bbac4ede94b159a7f8dd3896ccd82 (patch) | |
| tree | d09993a4276cd576ee95439dc9e52c2ef6ed5064 /Source | |
| parent | b1ef36a20abccfe7ada8d54bccc35661e0f541be (diff) | |
| parent | a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f (diff) | |
| download | CMake-5b9b141ee60bbac4ede94b159a7f8dd3896ccd82.zip CMake-5b9b141ee60bbac4ede94b159a7f8dd3896ccd82.tar.gz CMake-5b9b141ee60bbac4ede94b159a7f8dd3896ccd82.tar.bz2 | |
Merge topic 'doc-search-install-prefix'
a0b37d7 Document CMAKE_INSTALL_PREFIX in CMAKE_SYSTEM_PREFIX_PATH
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDocumentVariables.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 689508f..ceaa302 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -648,6 +648,10 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "WARNING: DESTDIR may not be used on Windows because installation" " prefix usually contains a drive letter like in \"C:/Program Files\"" " which cannot be prepended with some other prefix." + "\n" + "The installation prefix is also added to CMAKE_SYSTEM_PREFIX_PATH " + "so that find_package, find_program, find_library, find_path, and " + "find_file will search the prefix for other software." ,false, "Variables That Change Behavior"); @@ -725,7 +729,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "adds /bin to each of the directories in the path, FIND_LIBRARY() " "appends /lib to each of the directories, and FIND_PATH() and " "FIND_FILE() append /include . By default this contains the standard " - "directories for the current system. It is NOT intended " + "directories for the current system and the CMAKE_INSTALL_PREFIX. " + "It is NOT intended " "to be modified by the project, use CMAKE_PREFIX_PATH for this. See also " "CMAKE_SYSTEM_INCLUDE_PATH, CMAKE_SYSTEM_LIBRARY_PATH, " "CMAKE_SYSTEM_PROGRAM_PATH, and CMAKE_SYSTEM_IGNORE_PATH.", false, |