mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-15 03:48:02 +08:00
Merge branch 'backport-3.31-apple-CoreFoundation-headers'
This commit is contained in:
@@ -10,7 +10,8 @@
|
||||
#include <cm/string_view>
|
||||
#include <cmext/string_view>
|
||||
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#include <CoreFoundation/CFLocale.h>
|
||||
#include <CoreFoundation/CFString.h>
|
||||
#include <cm3p/kwiml/abi.h>
|
||||
|
||||
#include "cmsys/Base64.h"
|
||||
|
@@ -18,7 +18,9 @@
|
||||
class cmExecutionStatus;
|
||||
|
||||
#if defined(__APPLE__)
|
||||
# include <CoreFoundation/CoreFoundation.h>
|
||||
# include <CoreFoundation/CFBundle.h>
|
||||
# include <CoreFoundation/CFString.h>
|
||||
# include <CoreFoundation/CFURL.h>
|
||||
#endif
|
||||
|
||||
struct cmFindProgramHelper
|
||||
|
@@ -58,7 +58,10 @@
|
||||
#include "cmake.h"
|
||||
|
||||
#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
|
||||
# include <CoreFoundation/CoreFoundation.h>
|
||||
# include <CoreFoundation/CFBundle.h>
|
||||
# include <CoreFoundation/CFString.h>
|
||||
# include <CoreFoundation/CFURL.h>
|
||||
# include <CoreFoundation/CFUUID.h>
|
||||
# if !TARGET_OS_IPHONE
|
||||
# define HAVE_APPLICATION_SERVICES
|
||||
# include <ApplicationServices/ApplicationServices.h>
|
||||
|
@@ -6,8 +6,6 @@
|
||||
|
||||
#include <cmext/string_view>
|
||||
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
|
||||
char const* cmXCodeObject::PBXTypeNames[] = {
|
||||
/* clang-format needs this comment to break after the opening brace */
|
||||
"PBXGroup",
|
||||
|
Reference in New Issue
Block a user