diff options
| author | Brad King <brad.king@kitware.com> | 2006-04-04 09:35:22 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-04-04 09:35:22 -0400 |
| commit | cddedaa7d85c1a4ccc3502a6ec56f6e6cdea6f90 (patch) | |
| tree | 36bc7768d9b66e5d59f956739bb59d0996584bac /Source/cmIncludeDirectoryCommand.cxx | |
| parent | 66faeeeab4fb77800afdab5c9ea73ad71873fb71 (diff) | |
| download | cmake-cddedaa7d85c1a4ccc3502a6ec56f6e6cdea6f90.tar.gz | |
ENH: INCLUDE_DIRECTORIES should have been written to prepend to the include path so that the most local directories are included first. This is a patch from Alex to resolve the problem by allowing users to switch the default using a variable CMAKE_INCLUDE_DIRECTORIES_BEFORE and then still explicitly appending or prepending by using AFTER or BEFORE arguments explicitly.
Diffstat (limited to 'Source/cmIncludeDirectoryCommand.cxx')
| -rw-r--r-- | Source/cmIncludeDirectoryCommand.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx index eb21288971..eb07eb7d2d 100644 --- a/Source/cmIncludeDirectoryCommand.cxx +++ b/Source/cmIncludeDirectoryCommand.cxx @@ -26,12 +26,18 @@ bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& args std::vector<std::string>::const_iterator i = args.begin(); - bool before = false; + bool before = this->Makefile->IsOn("CMAKE_INCLUDE_DIRECTORIES_BEFORE"); + if ((*i) == "BEFORE") { before = true; ++i; } + else if ((*i) == "AFTER") + { + before = false; + ++i; + } for(; i != args.end(); ++i) { |