From c59937a4a84cfd9da7fdfe410e928eab9afe1998 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 17 Feb 2006 12:49:09 -0500 Subject: ENH: put the system path ahead of the command path --- Source/cmMakefile.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2fb9349..85c6620 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2382,12 +2382,12 @@ cmMakefile::GetIncludeSearchPath(const std::vector& 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& 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) -- cgit v0.12