[Cmake-commits] CMake branch, next, updated. v3.5.0-529-g757daf9

[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  757daf9a9d882cb7b68fe6f2a11b7df5c2bccb99 (commit)
       via  4c49fca19fecaea8920762ac36c0f06412cca002 (commit)
      from  7d01f3219105fe43ce0059709e4a266847a270bd (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=757daf9a9d882cb7b68fe6f2a11b7df5c2bccb99
commit 757daf9a9d882cb7b68fe6f2a11b7df5c2bccb99
Merge: 7d01f32 4c49fca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 18 09:58:47 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 18 09:58:47 2016 -0400

    Merge topic 'cpack-osx-optional-CoreServices' into next
    
    4c49fca1 fixup! CPack: Avoid using OS X CoreServices if compiler fails on header


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c49fca19fecaea8920762ac36c0f06412cca002
commit 4c49fca19fecaea8920762ac36c0f06412cca002
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 18 09:58:16 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 18 09:58:16 2016 -0400

    fixup! CPack: Avoid using OS X CoreServices if compiler fails on header

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 8009204..d6de77d 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -645,7 +645,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
                            kCFStringEncodingMacRoman);
         LangCode lang = 0;
         RegionCode region = 0;
-#if HAVE_CoreServices
+#ifdef HAVE_CoreServices
         OSStatus err = LocaleStringToLangAndRegionCodes(iso_language_cstr,
                                                         &lang, &region);
         if (err != noErr)
@@ -657,7 +657,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
           free(iso_language_cstr);
           return 0;
           }
-#if HAVE_CoreServices
+#ifdef HAVE_CoreServices
         free(iso_language_cstr);
         header_data.push_back(region);
         header_data.push_back(i);

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake