diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2022-08-07 16:01:34 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2022-08-07 16:01:34 -0600 |
| commit | a5f27a311fb28797a72b8aa16ec7122c5a1b15e4 (patch) | |
| tree | 3732f7339e29431f31310aef6ffc802cf4f6255d /cmake | |
| parent | 6c909fedc924d9f4257aa204b0168c6177cc5d28 (diff) | |
| parent | 629169462a82f0fbb7a8911a4554894537d6776c (diff) | |
| download | rneovim-a5f27a311fb28797a72b8aa16ec7122c5a1b15e4.tar.gz rneovim-a5f27a311fb28797a72b8aa16ec7122c5a1b15e4.tar.bz2 rneovim-a5f27a311fb28797a72b8aa16ec7122c5a1b15e4.zip | |
Merge branch 'master' of https://github.com/neovim/neovim into rahm
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/InstallClintErrors.cmake | 2 | ||||
| -rw-r--r-- | cmake/InstallHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/i386-linux-gnu.toolchain.cmake | 7 |
3 files changed, 1 insertions, 10 deletions
diff --git a/cmake/InstallClintErrors.cmake b/cmake/InstallClintErrors.cmake deleted file mode 100644 index bd5ca07828..0000000000 --- a/cmake/InstallClintErrors.cmake +++ /dev/null @@ -1,2 +0,0 @@ -file(GLOB_RECURSE JSON_FILES *.json) -file(COPY ${JSON_FILES} DESTINATION "${TARGET}") diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake index 9d997260cd..3786c4177f 100644 --- a/cmake/InstallHelpers.cmake +++ b/cmake/InstallHelpers.cmake @@ -45,7 +45,7 @@ function(create_install_dir_with_perms) while(NOT EXISTS \$ENV{DESTDIR}\${_current_dir} AND NOT \${_prev_dir} STREQUAL \${_current_dir}) list(APPEND _parent_dirs \${_current_dir}) set(_prev_dir \${_current_dir}) - get_filename_component(_current_dir \${_current_dir} PATH) + get_filename_component(_current_dir \${_current_dir} DIRECTORY) endwhile() if(_parent_dirs) diff --git a/cmake/i386-linux-gnu.toolchain.cmake b/cmake/i386-linux-gnu.toolchain.cmake deleted file mode 100644 index 089e37e5e8..0000000000 --- a/cmake/i386-linux-gnu.toolchain.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CMAKE_SYSTEM_PROCESSOR i386) -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION gnu) -if(NOT ${CMAKE_C_COMPILER}) - set(CMAKE_C_COMPILER gcc) -endif() -set(CMAKE_C_COMPILER_ARG1 "-m32") |