summaryrefslogtreecommitdiff
path: root/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
blob: 5b829904a13ec9b9bb4fe718bb7d4cb1495d8ac3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
 # used for check_c_compiler_flag
 include(CheckCCompilerFlag)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  # CMake tries to treat /sw and /opt/local as extension of the system path, but
-  # that doesn't really work out very well.  Once you have a dependency that
-  # resides there and have to add it as an include directory, then any other
-  # dependency that could be satisfied from there must be--otherwise you can end
-  # up with conflicting versions.  So, let's make them more of a priority having
-  # them be included as one of the first places to look for dependencies.
-  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
-
-  # Work around some old, broken detection by CMake for knowing when to use the
-  # isystem flag.  Apple's compilers have supported this for quite some time
-  # now.
-  if(CMAKE_COMPILER_IS_GNUCC)
-    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
-  endif()
-endif()
-
 if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   # Ignore case when comparing filenames on Windows and Mac.
   set(CASE_INSENSITIVE_FILENAME TRUE)
--- a/cmake.deps/CMakeLists.txt
+++ b/cmake.deps/CMakeLists.txt
@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER)
   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
 endif()
 
-if(CMAKE_OSX_SYSROOT)
-  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
-  if(DEPS_CXX_COMPILER)
-    set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
-  endif()
-endif()
-
 if(CMAKE_OSX_ARCHITECTURES)
   string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}")
   # The LuaJIT build does not like being passed multiple `-arch` flags
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
 foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
   list(APPEND gen_cflags "-I${gen_include}")
 endforeach()
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
-  list(APPEND gen_cflags "-isysroot")
-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
-endif()
 string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
 separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
 separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}})