[Cmake-commits] CMake branch, next, updated. v3.5.0-508-ga8e3ae2

[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  a8e3ae223f438f45fcd2ef3d1c774905731f3fca (commit)
       via  c718070c0887e1c429d6ae4b717c006236c32736 (commit)
      from  65e591cea4a7257f2891db15136e09ce2db5da22 (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=a8e3ae223f438f45fcd2ef3d1c774905731f3fca
commit a8e3ae223f438f45fcd2ef3d1c774905731f3fca
Merge: 65e591c c718070
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 14:49:59 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 17 14:49:59 2016 -0400

    Merge topic 'cpack-osx-no-carbon' into next
    
    c718070c CPack: Avoid requiring Carbon framework on OS X (#16021)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c718070c0887e1c429d6ae4b717c006236c32736
commit c718070c0887e1c429d6ae4b717c006236c32736
Author:     Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Mar 17 10:47:44 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 17 13:53:51 2016 -0400

    CPack: Avoid requiring Carbon framework on OS X (#16021)
    
    In commit v3.5.0-rc1~232^2 (CPackDMG: Add support for multilingual SLAs,
    2015-10-19) we added use of the Carbon framework in order to get access
    to its APIs to convert Script Manager RegionCode values.  This is not
    necessary.  Instead we can use CoreServices.
    
    While at it, replace individual CoreFoundation includes with including
    the entire framework, which is the correct way.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ab70568..5b67a2d 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -728,7 +728,7 @@ endif()
 add_library(CPackLib ${CPACK_SRCS})
 target_link_libraries(CPackLib CMakeLib)
 if(APPLE)
-  target_link_libraries(CPackLib "-framework Carbon")
+  target_link_libraries(CPackLib "-framework CoreServices")
 endif()
 
 if(APPLE)
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 7b94ca3..521b395 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -20,21 +20,12 @@
 
 #include <iomanip>
 
-#include <CoreFoundation/CFBase.h>
-#include <CoreFoundation/CFString.h>
-#include <CoreFoundation/CFLocale.h>
-
-// The carbon framework is deprecated, but the Region codes it supplies are
-// needed for the LPic data structure used for generating multi-lingual SLAs.
-// There does not seem to be a replacement API for these region codes.
-#if defined(__clang__)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-#include <Carbon/Carbon.h>
-#if defined(__clang__)
-# pragma clang diagnostic pop
-#endif
+#include <CoreFoundation/CoreFoundation.h>
+
+// For the old LocaleStringToLangAndRegionCodes() function, to convert
+// to the old Script Manager RegionCode values needed for the 'LPic' data
+// structure used for generating multi-lingual SLAs.
+#include <CoreServices/CoreServices.h>
 
 static const char* SLAHeader =
 "data 'LPic' (5000) {\n"

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

Summary of changes:
 Source/CMakeLists.txt                      |    2 +-
 Source/CPack/cmCPackDragNDropGenerator.cxx |   21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake