2019-02-24 07:56:01 +00:00
|
|
|
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
|
|
|
|
|
index 8aff8f6..af1852d 100644
|
|
|
|
|
--- a/Source/CMakeLists.txt
|
|
|
|
|
+++ b/Source/CMakeLists.txt
|
2019-03-03 04:56:50 +00:00
|
|
|
@@ -791,12 +791,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc"
|
2019-02-24 07:56:01 +00:00
|
|
|
endif()
|
|
|
|
|
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)
|
|
|
|
|
# We need the rpcrt4 library on Windows.
|
|
|
|
|
# We need the crypt32 library on Windows for crypto/cert APIs.
|
|
|
|
|
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
|
|
|
|
|
index e353a37..b06f842 100644
|
|
|
|
|
--- a/Source/cmGlobalXCodeGenerator.cxx
|
|
|
|
|
+++ b/Source/cmGlobalXCodeGenerator.cxx
|
2018-05-28 12:46:45 +01:00
|
|
|
@@ -35,11 +35,6 @@
|
|
|
|
|
|
|
|
|
|
struct cmLinkImplementation;
|
|
|
|
|
|
|
|
|
|
-#if defined(CMAKE_BUILD_WITH_CMAKE) && 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
|
|
|
|
|
-
|
|
|
|
|
#if defined(CMAKE_BUILD_WITH_CMAKE)
|
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
|
|
|
|
|
index d7af6e2..d4808fc 100644
|
|
|
|
|
--- a/Utilities/cmlibarchive/CMakeLists.txt
|
|
|
|
|
+++ b/Utilities/cmlibarchive/CMakeLists.txt
|
|
|
|
|
@@ -1662,11 +1662,6 @@ IF(MSVC)
|
|
|
|
|
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
|
|
|
|
|
ENDIF(MSVC)
|
|
|
|
|
|
|
|
|
|
-# We need CoreServices on Mac OS.
|
|
|
|
|
-IF(APPLE)
|
|
|
|
|
- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices")
|
|
|
|
|
-ENDIF(APPLE)
|
|
|
|
|
-
|
|
|
|
|
add_subdirectory(libarchive)
|
|
|
|
|
|
|
|
|
|
install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
|
2019-07-08 20:48:19 +01:00
|
|
|
index e505bdd..f45557d 100644
|
|
|
|
|
--- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c
|
|
|
|
|
+++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c
|
|
|
|
|
@@ -30,7 +30,6 @@
|
|
|
|
|
|
|
|
|
|
#if !TARGET_OS_IPHONE
|
|
|
|
|
# include <CoreFoundation/CoreFoundation.h>
|
|
|
|
|
-# include <ApplicationServices/ApplicationServices.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8)
|
