2019-02-24 07:56:01 +00:00
|
|
|
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
|
2020-07-26 16:40:05 +01:00
|
|
|
index 1b6bb00d4c..487114daa8 100644
|
2019-02-24 07:56:01 +00:00
|
|
|
--- a/Source/CMakeLists.txt
|
|
|
|
|
+++ b/Source/CMakeLists.txt
|
2020-07-26 16:40:05 +01:00
|
|
|
@@ -893,7 +893,6 @@ endif()
|
2019-03-03 04:56:50 +00:00
|
|
|
# On Apple we need CoreFoundation and CoreServices
|
|
|
|
|
if(APPLE)
|
|
|
|
|
target_link_libraries(CMakeLib "-framework CoreFoundation")
|
2019-02-24 07:56:01 +00:00
|
|
|
- target_link_libraries(CMakeLib "-framework CoreServices")
|
2019-03-03 04:56:50 +00:00
|
|
|
endif()
|
|
|
|
|
|
2019-02-24 07:56:01 +00:00
|
|
|
if(WIN32 AND NOT UNIX)
|
|
|
|
|
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
|
2020-07-26 16:40:05 +01:00
|
|
|
index a5ce5d18f4..3d6838ce82 100644
|
2019-02-24 07:56:01 +00:00
|
|
|
--- a/Source/cmGlobalXCodeGenerator.cxx
|
|
|
|
|
+++ b/Source/cmGlobalXCodeGenerator.cxx
|
2020-07-26 16:40:05 +01:00
|
|
|
@@ -43,11 +43,6 @@
|
2018-05-28 12:46:45 +01:00
|
|
|
|
|
|
|
|
struct cmLinkImplementation;
|
|
|
|
|
|
2019-11-26 20:45:58 +00:00
|
|
|
-#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
|
2018-08-13 00:51:01 +01:00
|
|
|
-# define HAVE_APPLICATION_SERVICES
|
|
|
|
|
-# include <ApplicationServices/ApplicationServices.h>
|
2018-05-28 12:46:45 +01:00
|
|
|
-#endif
|
|
|
|
|
-
|
2019-11-26 20:45:58 +00:00
|
|
|
#if !defined(CMAKE_BOOTSTRAP)
|
2018-08-13 00:51:01 +01:00
|
|
|
# include "cmXMLParser.h"
|
2018-05-28 12:46:45 +01:00
|
|
|
|
2019-02-24 07:56:01 +00:00
|
|
|
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
|
2020-07-26 16:40:05 +01:00
|
|
|
index bfcaf30bb7..1da540aee5 100644
|
2019-02-24 07:56:01 +00:00
|
|
|
--- a/Utilities/cmlibarchive/CMakeLists.txt
|
|
|
|
|
+++ b/Utilities/cmlibarchive/CMakeLists.txt
|
2020-07-26 16:40:05 +01:00
|
|
|
@@ -2007,11 +2007,6 @@ IF(ENABLE_TEST)
|
|
|
|
|
ENDIF(ENABLE_TEST)
|
|
|
|
|
ENDIF()
|
2019-02-24 07:56:01 +00:00
|
|
|
|
|
|
|
|
-# We need CoreServices on Mac OS.
|
|
|
|
|
-IF(APPLE)
|
|
|
|
|
- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices")
|
|
|
|
|
-ENDIF(APPLE)
|
|
|
|
|
-
|
|
|
|
|
add_subdirectory(libarchive)
|
2020-07-26 16:40:05 +01:00
|
|
|
IF(0) # CMake does not build libarchive's command-line tools.
|
|
|
|
|
add_subdirectory(cat)
|
