kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cpack-osx-no-carbon' into release

This commit is contained in:
Brad King 2016-03-17 14:49:35 -04:00
parent 4ea249a387 c718070c08
commit 15a5653ea6
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -728,7 +728,7 @@ endif()
add_library(CPackLib ${CPACK_SRCS}) add_library(CPackLib ${CPACK_SRCS})
target_link_libraries(CPackLib CMakeLib) target_link_libraries(CPackLib CMakeLib)
if(APPLE) if(APPLE)
target_link_libraries(CPackLib "-framework Carbon") target_link_libraries(CPackLib "-framework CoreServices")
endif() endif()
if(APPLE) if(APPLE)

19
Source/CPack/cmCPackDragNDropGenerator.cxx
View File

@ -20,21 +20,12 @@
#include <iomanip> #include <iomanip>
#include <CoreFoundation/CFBase.h> #include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFString.h>
#include <CoreFoundation/CFLocale.h>
// The carbon framework is deprecated, but the Region codes it supplies are // For the old LocaleStringToLangAndRegionCodes() function, to convert
// needed for the LPic data structure used for generating multi-lingual SLAs. // to the old Script Manager RegionCode values needed for the 'LPic' data
// There does not seem to be a replacement API for these region codes. // structure used for generating multi-lingual SLAs.
#if defined(__clang__) #include <CoreServices/CoreServices.h>
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include <Carbon/Carbon.h>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
static const char* SLAHeader = static const char* SLAHeader =
"data 'LPic' (5000) {\n" "data 'LPic' (5000) {\n"