diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-22 19:40:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 19:40:58 +0100 |
| commit | 84d4e4a7ef70e594cca6af96fd0967ce089f6db0 (patch) | |
| tree | 4b88f9be7528a76dcb4b0b95501da78773b4d2b1 /src | |
| parent | 59ac1703407ef88ed2a1e5ed7032dfb115f5d2ba (diff) | |
| parent | 17b21eae52c83b92e80d8de757185c3d27de49d6 (diff) | |
| download | rneovim-84d4e4a7ef70e594cca6af96fd0967ce089f6db0.tar.gz rneovim-84d4e4a7ef70e594cca6af96fd0967ce089f6db0.tar.bz2 rneovim-84d4e4a7ef70e594cca6af96fd0967ce089f6db0.zip | |
Merge #7891 'build: fix creating generated files on macOS'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 5 |
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}}) |