diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-17 18:49:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-17 18:49:35 (GMT) |
| commit | 15a5653ea6cfc3b26634d3a5cea483e5a9ddd97a (patch) | |
| tree | c6887a4b6c3ca56898204ec6e6e44afa938f07a9 | |
| parent | 4ea249a387e808fa3d6c1f4648df7e094cf0d8a7 (diff) | |
| parent | c718070c0887e1c429d6ae4b717c006236c32736 (diff) | |
| download | CMake-15a5653ea6cfc3b26634d3a5cea483e5a9ddd97a.zip CMake-15a5653ea6cfc3b26634d3a5cea483e5a9ddd97a.tar.gz CMake-15a5653ea6cfc3b26634d3a5cea483e5a9ddd97a.tar.bz2 | |
Merge branch 'cpack-osx-no-carbon' into release
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 21 |
2 files changed, 7 insertions, 16 deletions
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" |