[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1089-gd6d246f

[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  d6d246f7531e7ce242caff3b684fcc3859f48524 (commit)
       via  79066b4fb3ee8c563ae0d3eace433300b31ab63a (commit)
      from  5bd6a68e44c88c40d17471414a7b4bb45727f693 (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=d6d246f7531e7ce242caff3b684fcc3859f48524
commit d6d246f7531e7ce242caff3b684fcc3859f48524
Merge: 5bd6a68 79066b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 13:29:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 15 13:29:51 2015 -0400

    Merge topic 'OUTPUT_DIRECTORY-genex' into next
    
    79066b4f fixup! Add genex for {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY[_<CONFIG>]


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79066b4fb3ee8c563ae0d3eace433300b31ab63a
commit 79066b4fb3ee8c563ae0d3eace433300b31ab63a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 13:23:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 15 13:23:02 2015 -0400

    fixup! Add genex for {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY[_<CONFIG>]

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