aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2018-01-22 05:26:51 -0500
committerJohn Szakmeister <john@szakmeister.net>2018-01-22 06:27:14 -0500
commit17b21eae52c83b92e80d8de757185c3d27de49d6 (patch)
tree2ea243af7c507118a767bd5de354e8a6bbef9a2c /src
parent2820860ba35e09c719b91704cbb3cba37fb60cf3 (diff)
downloadrneovim-17b21eae52c83b92e80d8de757185c3d27de49d6.tar.gz
rneovim-17b21eae52c83b92e80d8de757185c3d27de49d6.tar.bz2
rneovim-17b21eae52c83b92e80d8de757185c3d27de49d6.zip
build: fix creating generated files on macOS
For some reason, using the clang executable inside of the Xcode default toolchain the platform's sysroot include isn't present. This was debugged by adding "-###" on the command line for generating the header for nvim/os/lang.c and is was evident the flag was missing.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 7eb1afa135..b14f93f90a 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -14,6 +14,7 @@ if(WIN32)
# tell MinGW compiler to enable wmain
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iframework CoreFoundation")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreFoundation")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -framework CoreFoundation")
endif()
@@ -187,6 +188,10 @@ 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}})