Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 12:16:40 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'backport-3.31-apple-CoreFoundation-headers'

Browse Source
This commit is contained in:
Brad King
2025-04-08 11:39:10 -04:00
parent f21682cf1a 42390e7aa2
commit d736dafa22
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/cmCPackDragNDropGenerator.cxx
View File

@@ -10,7 +10,8 @@
#include <cm/string_view> #include <cm/string_view>
#include <cmext/string_view> #include <cmext/string_view>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CFLocale.h>
#include <CoreFoundation/CFString.h>
#include <cm3p/kwiml/abi.h> #include <cm3p/kwiml/abi.h>
#include "cmsys/Base64.h" #include "cmsys/Base64.h"

4
Source/cmFindProgramCommand.cxx
View File

@@ -18,7 +18,9 @@
class cmExecutionStatus; class cmExecutionStatus;
#if defined(__APPLE__) #if defined(__APPLE__)
# include <CoreFoundation/CoreFoundation.h> # include <CoreFoundation/CFBundle.h>
# include <CoreFoundation/CFString.h>
# include <CoreFoundation/CFURL.h>
#endif #endif
struct cmFindProgramHelper struct cmFindProgramHelper

5
Source/cmGlobalXCodeGenerator.cxx
View File

@@ -58,7 +58,10 @@
#include "cmake.h" #include "cmake.h"
#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) #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 # if !TARGET_OS_IPHONE
# define HAVE_APPLICATION_SERVICES # define HAVE_APPLICATION_SERVICES
# include <ApplicationServices/ApplicationServices.h> # include <ApplicationServices/ApplicationServices.h>

2
Source/cmXCodeObject.cxx
View File

@@ -6,8 +6,6 @@
#include <cmext/string_view> #include <cmext/string_view>
#include <CoreFoundation/CoreFoundation.h>
char const* cmXCodeObject::PBXTypeNames[] = { char const* cmXCodeObject::PBXTypeNames[] = {
/* clang-format needs this comment to break after the opening brace */ /* clang-format needs this comment to break after the opening brace */
"PBXGroup", "PBXGroup",