[Cmake-commits] CMake branch, next, updated. v3.6.1-1737-g25e5ed1

[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  25e5ed190800415a6423e98e3de023a6b4b3251f (commit)
       via  3e380ba055818d14064c42080ffe00b216b92b1b (commit)
      from  2c0c7856e20026c74311d927a63338e26cfeb727 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25e5ed190800415a6423e98e3de023a6b4b3251f
commit 25e5ed190800415a6423e98e3de023a6b4b3251f
Merge: 2c0c785 3e380ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 3 07:27:34 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 3 07:27:34 2016 -0400

    Merge topic 'test-GenerateExportHeader-with-RunCMake' into next
    
    3e380ba0 fixup! Tests: Cleanup RunCMake.GenerateExportHeader somewhat


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e380ba055818d14064c42080ffe00b216b92b1b
commit 3e380ba055818d14064c42080ffe00b216b92b1b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 3 07:26:40 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Sep 3 07:26:40 2016 -0400

    fixup! Tests: Cleanup RunCMake.GenerateExportHeader somewhat

diff --git a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
index 2828437..ff81f35 100644
--- a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
@@ -28,6 +28,6 @@ generate_export_header(shared_variant
   CUSTOM_CONTENT_FROM_VARIABLE MY_CUSTOM_CONTENT
 )
 
-set_target_properties(static_variant PROPERTIES COMPILE_FLAGS -DLIBSHARED_AND_STATIC_STATIC_DEFINE)
+target_compile_definitions(static_variant PUBLIC MYPREFIX_LIBSHARED_AND_STATIC_STATIC_DEFINE)
 
 export(TARGETS shared_variant static_variant FILE Targets.cmake)

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

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


hooks/post-receive
-- 
CMake