[Cmake-commits] CMake branch, next, updated. v3.4.0-1538-g4ef2913

[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  4ef291346729d0807a9a0f92b42b517941cf9809 (commit)
       via  0d8d36d0dc8f89116bf8b5a6f11bb367db2c23c0 (commit)
      from  a2d81f68df75eba057b47b96a7dcab81bee75ece (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=4ef291346729d0807a9a0f92b42b517941cf9809
commit 4ef291346729d0807a9a0f92b42b517941cf9809
Merge: a2d81f6 0d8d36d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 30 12:56:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 30 12:56:52 2015 -0500

    Merge topic 'cpack-dmg-multilanguage-sla' into next
    
    0d8d36d0 fixup! CPack/DragNDrop: Allow single license for multiple languages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d8d36d0dc8f89116bf8b5a6f11bb367db2c23c0
commit 0d8d36d0dc8f89116bf8b5a6f11bb367db2c23c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 30 12:50:25 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 30 12:50:25 2015 -0500

    fixup! CPack/DragNDrop: Allow single license for multiple languages

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 31665da..1a694ea 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -69,6 +69,7 @@ static const char* SLASTREnglish =
 
 //----------------------------------------------------------------------
 cmCPackDragNDropGenerator::cmCPackDragNDropGenerator()
+  : singleLicense(false)
 {
   // default to one package file for components
   this->componentPackageMethod = ONE_PACKAGE;
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index 92ec845..b5e5ffe 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -48,7 +48,7 @@ protected:
 
 private:
   std::string slaDirectory;
-  bool singleLicense = false;
+  bool singleLicense;
 
   void WriteLicense(cmGeneratedFileStream& outputStream, int licenseNumber,
     std::string licenseLanguage, std::string licenseFile = "");

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |    1 +
 Source/CPack/cmCPackDragNDropGenerator.h   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake