[Cmake-commits] CMake branch, next, updated. v3.3.1-2323-gc660fc3

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c660fc32242906a361ca99c513465278bcc0fe97 (commit)
       via  a4bd30104fe6df3e4a6a37d0abb640a28126009d (commit)
      from  415769c967b1b583fe350dd077b1142935b04361 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c660fc32242906a361ca99c513465278bcc0fe97
commit c660fc32242906a361ca99c513465278bcc0fe97
Merge: 415769c a4bd301
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 21 15:21:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 21 15:21:45 2015 -0400

    Merge topic 'fix-include_directories-BEFORE' into next
    
    a4bd3010 include_directories: Fix regression in BEFORE option (#15693)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4bd30104fe6df3e4a6a37d0abb640a28126009d
commit a4bd30104fe6df3e4a6a37d0abb640a28126009d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 21 13:42:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 21 15:21:37 2015 -0400

    include_directories: Fix regression in BEFORE option (#15693)
    
    Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for
    directories, 2015-07-18) broke include_directories(BEFORE).  Fix it and
    add a test case.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index f425861..4ad6d3b 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1296,22 +1296,21 @@ void cmState::Directory::PrependIncludeDirectoriesEntry(
       this->DirectoryState->IncludeDirectories.begin()
       + this->Snapshot_.Position->IncludeDirectoryPosition;
 
-  std::vector<std::string>::const_reverse_iterator rend =
+  std::vector<std::string>::reverse_iterator rend =
       this->DirectoryState->IncludeDirectories.rend();
   std::vector<std::string>::reverse_iterator rbegin =
       cmMakeReverseIterator(entryEnd);
-  std::vector<std::string>::const_reverse_iterator crbegin = rbegin;
-  crbegin = std::find(crbegin, rend, cmPropertySentinal);
+  rbegin = std::find(rbegin, rend, cmPropertySentinal);
 
-  std::vector<std::string>::const_iterator entryIt = crbegin.base();
-  std::vector<std::string>::const_iterator entryBegin =
+  std::vector<std::string>::iterator entryIt = rbegin.base();
+  std::vector<std::string>::iterator entryBegin =
       this->DirectoryState->IncludeDirectories.begin();
 
   std::vector<cmListFileBacktrace>::iterator btIt =
       this->DirectoryState->IncludeDirectoryBacktraces.begin()
       + std::distance(entryBegin, entryIt);
 
-  this->DirectoryState->IncludeDirectories.insert(rbegin.base(), vec);
+  this->DirectoryState->IncludeDirectories.insert(entryIt, vec);
   this->DirectoryState->IncludeDirectoryBacktraces.insert(btIt, lfbt);
 
   this->Snapshot_.Position->IncludeDirectoryPosition =
diff --git a/Tests/RunCMake/include_directories/DirectoryBefore-stdout.txt b/Tests/RunCMake/include_directories/DirectoryBefore-stdout.txt
new file mode 100644
index 0000000..e986082
--- /dev/null
+++ b/Tests/RunCMake/include_directories/DirectoryBefore-stdout.txt
@@ -0,0 +1 @@
+-- INCLUDE_DIRECTORIES: '[^;]*/Tests/RunCMake/include_directories/BeforeDir;[^;]*/Tests/RunCMake/include_directories/AfterDir'
diff --git a/Tests/RunCMake/include_directories/DirectoryBefore.cmake b/Tests/RunCMake/include_directories/DirectoryBefore.cmake
new file mode 100644
index 0000000..be3f663
--- /dev/null
+++ b/Tests/RunCMake/include_directories/DirectoryBefore.cmake
@@ -0,0 +1,4 @@
+include_directories(AfterDir)
+include_directories(BEFORE BeforeDir)
+get_property(dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+message(STATUS "INCLUDE_DIRECTORIES: '${dirs}'")
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index 54d5e97..57e8274 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/NotDefa
 
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
+run_cmake(DirectoryBefore)
 run_cmake(TID-bad-target)
 run_cmake(ImportedTarget)
 run_cmake(CMP0021)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake