[Cmake-commits] CMake branch, next, updated. v3.1.1-2246-gcdfbe11

[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  cdfbe11b7387eeb3594244feace5c99c1d090773 (commit)
       via  560b3e9f1df04808593997e7d1f6ac43c7b0c141 (commit)
      from  da9ed6be3896a3bdaed9cddfbf2fccc944992451 (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=cdfbe11b7387eeb3594244feace5c99c1d090773
commit cdfbe11b7387eeb3594244feace5c99c1d090773
Merge: da9ed6b 560b3e9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 14:12:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 22 14:12:22 2015 -0500

    Merge topic 'test-complex-remove-bad-indentation' into next
    
    560b3e9f Tests: Remove incorrect indentation from Complex test comment


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=560b3e9f1df04808593997e7d1f6ac43c7b0c141
commit 560b3e9f1df04808593997e7d1f6ac43c7b0c141
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 14:11:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 22 14:11:46 2015 -0500

    Tests: Remove incorrect indentation from Complex test comment

diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index 508221c..a1f8e68 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})
 
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
index e910f20..b2307b2 100644
--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/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/ComplexOneConfig/Executable/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake