[Cmake-commits] CMake branch, next, updated. v3.3.0-2176-g4e2f5af

[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  4e2f5af4f8c3b22fd99f8aca23401a05216917b6 (commit)
       via  5c69f02a3ade91bfb85d6c782ca16ac31d993e69 (commit)
      from  54f235ecda0700d9ffea68ee6b254c5ef822dae0 (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=4e2f5af4f8c3b22fd99f8aca23401a05216917b6
commit 4e2f5af4f8c3b22fd99f8aca23401a05216917b6
Merge: 54f235e 5c69f02
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 13:42:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 12 13:42:49 2015 -0400

    Merge topic 'OUTPUT_DIRECTORY-genex' into next
    
    5c69f02a fixup! Add generator expression support to OUTPUT_DIRECTORY target properties


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c69f02a3ade91bfb85d6c782ca16ac31d993e69
commit 5c69f02a3ade91bfb85d6c782ca16ac31d993e69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 13:39:45 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 12 13:39:45 2015 -0400

    fixup! Add generator expression support to OUTPUT_DIRECTORY target properties

diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 4df5d07..7fdfaa8 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -111,9 +111,9 @@ target_link_libraries(testExe4 testExe1lib)
 set_property(TARGET testLib7 PROPERTY ARCHIVE_OUTPUT_DIRECTORY_DEBUG testLib7D-$<CONFIG>)
 set_property(TARGET testLib7 PROPERTY ARCHIVE_OUTPUT_DIRECTORY_RELEASE testLib7R-$<CONFIG>)
 set_property(TARGET testLib7 PROPERTY ARCHIVE_OUTPUT_DIRECTORY testLib7-$<CONFIG>)
-set_property(TARGET testLib4 PROPERTY LIBRARY_OUTPUT_DIRECTORY_DEBUG testLib4D-$<CONFIG>)
-set_property(TARGET testLib4 PROPERTY LIBRARY_OUTPUT_DIRECTORY_RELEASE testLib4R-$<CONFIG>)
-set_property(TARGET testLib4 PROPERTY LIBRARY_OUTPUT_DIRECTORY testLib4-$<CONFIG>)
+set_property(TARGET testLib5 PROPERTY LIBRARY_OUTPUT_DIRECTORY_DEBUG testLib5D-$<CONFIG>)
+set_property(TARGET testLib5 PROPERTY LIBRARY_OUTPUT_DIRECTORY_RELEASE testLib5R-$<CONFIG>)
+set_property(TARGET testLib5 PROPERTY LIBRARY_OUTPUT_DIRECTORY testLib5-$<CONFIG>)
 set_property(TARGET testExe4 PROPERTY RUNTIME_OUTPUT_DIRECTORY_DEBUG testExe4D-$<CONFIG>)
 set_property(TARGET testExe4 PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE testExe4R-$<CONFIG>)
 set_property(TARGET testExe4 PROPERTY RUNTIME_OUTPUT_DIRECTORY testExe4-$<CONFIG>)

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

Summary of changes:
 Tests/ExportImport/Export/CMakeLists.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake