ENH: Renamed CMAKE_FIND_PREFIX_PATH to CMAKE_PREFIX_PATH for brevity and consistency with other find path variable names.
This commit is contained in:
parent
d1fdc38c68
commit
07db9b83a7
|
@ -83,7 +83,7 @@ cmFindBase::cmFindBase()
|
|||
"1. Search cmake specific environment variables. This "
|
||||
"can be skipped if NO_CMAKE_ENVIRONMENT_PATH is passed.\n"
|
||||
""
|
||||
" <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_FIND_PREFIX_PATH\n"
|
||||
" <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_PREFIX_PATH\n"
|
||||
" CMAKE_FRAMEWORK_PATH\n"
|
||||
" CMAKE_APPBUNDLE_PATH\n"
|
||||
" CMAKE_XXX_PATH\n"
|
||||
|
@ -93,7 +93,7 @@ cmFindBase::cmFindBase()
|
|||
"-DVAR=value. This can be skipped if NO_CMAKE_PATH "
|
||||
"is passed.\n"
|
||||
""
|
||||
" <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_FIND_PREFIX_PATH\n"
|
||||
" <prefix>/XXX_SUBDIR for each <prefix> in CMAKE_PREFIX_PATH\n"
|
||||
" CMAKE_FRAMEWORK_PATH\n"
|
||||
" CMAKE_APPBUNDLE_PATH\n"
|
||||
" CMAKE_XXX_PATH\n"
|
||||
|
@ -553,7 +553,7 @@ void cmFindBase::AddEnvironmentVariables()
|
|||
std::vector<std::string> paths;
|
||||
|
||||
std::vector<std::string> prefixPaths;
|
||||
cmSystemTools::GetPath(prefixPaths, "CMAKE_FIND_PREFIX_PATH");
|
||||
cmSystemTools::GetPath(prefixPaths, "CMAKE_PREFIX_PATH");
|
||||
this->AddFindPrefix(paths, prefixPaths);
|
||||
|
||||
std::string var = "CMAKE_";
|
||||
|
@ -690,7 +690,7 @@ void cmFindBase::AddCMakeVariables()
|
|||
std::vector<std::string> paths;
|
||||
|
||||
if(const char* prefixPath =
|
||||
this->Makefile->GetDefinition("CMAKE_FIND_PREFIX_PATH"))
|
||||
this->Makefile->GetDefinition("CMAKE_PREFIX_PATH"))
|
||||
{
|
||||
std::vector<std::string> prefixPaths;
|
||||
cmSystemTools::ExpandListArgument(prefixPath, prefixPaths);
|
||||
|
|
|
@ -11,14 +11,14 @@ FIND_PACKAGE(VTK QUIET)
|
|||
|
||||
ADD_EXECUTABLE(FindPackageTest FindPackageTest.cxx)
|
||||
|
||||
# test behaviour of cmFindBase wrt. the CMAKE_FIND_PREFIX_PATH variable
|
||||
# test behaviour of cmFindBase wrt. the CMAKE_PREFIX_PATH variable
|
||||
# foo.h should be found in ${CMAKE_CURRENT_SOURCE_DIR}/include:
|
||||
|
||||
SET(CMAKE_FIND_PREFIX_PATH /blub /blah "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
SET(CMAKE_PREFIX_PATH /blub /blah "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
FIND_PATH(FOO_DIR foo.h)
|
||||
|
||||
IF(NOT FOO_DIR)
|
||||
MESSAGE(FATAL_ERROR "Did not find foo.h which is in ${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
CMAKE_FIND_PREFIX_PATH = ${CMAKE_FIND_PREFIX_PATH}")
|
||||
CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
|
||||
ENDIF(NOT FOO_DIR)
|
||||
|
||||
|
|
Loading…
Reference in New Issue