Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
c59937a4
Commit
c59937a4
authored
Feb 17, 2006
by
Bill Hoffman
Browse files
ENH: put the system path ahead of the command path
parent
a5b8b060
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
c59937a4
...
...
@@ -2382,12 +2382,12 @@ cmMakefile::GetIncludeSearchPath(const std::vector<std::string>& callerPaths,
// Add paths in the user's environment.
cmSystemTools
::
GetPath
(
path
,
"CMAKE_INCLUDE_PATH"
);
cmSystemTools
::
GetPath
(
path
,
"INCLUDE"
);
// Add standard system paths.
cmSystemTools
::
GetPath
(
path
);
// Add paths given by the caller.
path
.
insert
(
path
.
end
(),
callerPaths
.
begin
(),
callerPaths
.
end
());
// Add standard system paths.
cmSystemTools
::
GetPath
(
path
);
}
//----------------------------------------------------------------------------
...
...
@@ -2404,12 +2404,11 @@ cmMakefile::GetLibrarySearchPath(const std::vector<std::string>& callerPaths,
// Add paths in the user's environment.
cmSystemTools
::
GetPath
(
path
,
"CMAKE_LIBRARY_PATH"
);
cmSystemTools
::
GetPath
(
path
,
"LIB"
);
// Add standard system paths.
cmSystemTools
::
GetPath
(
path
);
// Add paths given by the caller.
path
.
insert
(
path
.
end
(),
callerPaths
.
begin
(),
callerPaths
.
end
());
// Add standard system paths.
cmSystemTools
::
GetPath
(
path
);
}
std
::
string
cmMakefile
::
GetModulesFile
(
const
char
*
filename
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment