mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 19:45:54 +00:00
a761d5ed1b
Fixes missing CoreFoundation declarations since bump to 3.19.3,
e.g. `error: unknown type name 'CFUUIDRef'`
ApplicationServices.h transitively includes CoreFoundation.h, but as we
patch ApplicationServices out of CMake, the CF symbols were not visible.
Previously this was not a concern, as they were not needed until
d250b67722
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
|
|
index 1b6bb00d4c..487114daa8 100644
|
|
--- a/Source/CMakeLists.txt
|
|
+++ b/Source/CMakeLists.txt
|
|
@@ -893,7 +893,6 @@ endif()
|
|
# On Apple we need CoreFoundation and CoreServices
|
|
if(APPLE)
|
|
target_link_libraries(CMakeLib "-framework CoreFoundation")
|
|
- target_link_libraries(CMakeLib "-framework CoreServices")
|
|
endif()
|
|
|
|
if(WIN32 AND NOT UNIX)
|
|
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
|
|
index a5ce5d18f4..3d6838ce82 100644
|
|
--- a/Source/cmGlobalXCodeGenerator.cxx
|
|
+++ b/Source/cmGlobalXCodeGenerator.cxx
|
|
@@ -43,11 +43,10 @@
|
|
|
|
struct cmLinkImplementation;
|
|
|
|
#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
|
|
-# define HAVE_APPLICATION_SERVICES
|
|
-# include <ApplicationServices/ApplicationServices.h>
|
|
+# include <CoreFoundation/CoreFoundation.h>
|
|
#endif
|
|
|
|
#if !defined(CMAKE_BOOTSTRAP)
|
|
# include "cmXMLParser.h"
|
|
|
|
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
|
|
index bfcaf30bb7..1da540aee5 100644
|
|
--- a/Utilities/cmlibarchive/CMakeLists.txt
|
|
+++ b/Utilities/cmlibarchive/CMakeLists.txt
|
|
@@ -2007,11 +2007,6 @@ IF(ENABLE_TEST)
|
|
ENDIF(ENABLE_TEST)
|
|
ENDIF()
|
|
|
|
-# We need CoreServices on Mac OS.
|
|
-IF(APPLE)
|
|
- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices")
|
|
-ENDIF(APPLE)
|
|
-
|
|
add_subdirectory(libarchive)
|
|
IF(0) # CMake does not build libarchive's command-line tools.
|
|
add_subdirectory(cat)
|