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 73b5206f39e5e85314184ddc7c1f84a9b3dd7999 (commit) via 2c52ad3b97745c24abaff1fbe1005cefed58b7b3 (commit) from 3296f9c8f9aa1f418fd9c8b195588df7e1ddee14 (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=73b5206f39e5e85314184ddc7c1f84a9b3dd7999 commit 73b5206f39e5e85314184ddc7c1f84a9b3dd7999 Merge: 3296f9c 2c52ad3 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Aug 21 13:48:05 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Aug 21 13:48:05 2015 -0400 Merge topic 'fix-include_directories-BEFORE' into next 2c52ad3b include_directories: Fix regression in BEFORE option (#15693) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c52ad3b97745c24abaff1fbe1005cefed58b7b3 commit 2c52ad3b97745c24abaff1fbe1005cefed58b7b3 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Aug 21 13:42:04 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Aug 21 13:47:53 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..81c7275 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1311,7 +1311,7 @@ void cmState::Directory::PrependIncludeDirectoriesEntry( 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: Source/cmState.cxx | 2 +- Tests/RunCMake/include_directories/DirectoryBefore-stdout.txt | 1 + Tests/RunCMake/include_directories/DirectoryBefore.cmake | 4 ++++ Tests/RunCMake/include_directories/RunCMakeTest.cmake | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/include_directories/DirectoryBefore-stdout.txt create mode 100644 Tests/RunCMake/include_directories/DirectoryBefore.cmake hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits