[Cmake-commits] CMake branch, next, updated. v3.1.1-2260-g688d06a

[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  688d06a039b3c1a3305bd73922e74d3f5eb3c5a2 (commit)
       via  9ab1060cf6496a63c33f767faa9ae208331fe1fe (commit)
      from  1cb31f76cf50ca5c734fa86483d8bfdbf984b647 (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=688d06a039b3c1a3305bd73922e74d3f5eb3c5a2
commit 688d06a039b3c1a3305bd73922e74d3f5eb3c5a2
Merge: 1cb31f7 9ab1060
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 19:35:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 22 19:35:16 2015 -0500

    Merge topic 'if-test' into next
    
    9ab1060c Tests: Restore Complex test change removed by topic conflict


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ab1060cf6496a63c33f767faa9ae208331fe1fe
commit 9ab1060cf6496a63c33f767faa9ae208331fe1fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 19:35:08 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 22 19:35:08 2015 -0500

    Tests: Restore Complex test change removed by topic conflict

diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index bf23d4a..bbd5878 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -21,7 +21,7 @@ if(TARGET NotATarget)
   message(FATAL_ERROR "if(TARGET NotATarget) returned true!")
 endif()
 
-  # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
+# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
 set(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
 link_libraries(${COMPLEX_LIBS})
 

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

Summary of changes:
 Tests/Complex/Executable/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake