diff options
| author | Daniel Hahler <git@thequod.de> | 2019-07-15 22:27:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 22:27:29 +0200 |
| commit | 31f879983f5effb94a8d62c3073576511131bf6e (patch) | |
| tree | 2f930b489f6146bd4ef1cb8318d3c40fb9114079 | |
| parent | 519382646be32735735842c5632b9361bf7864a4 (diff) | |
| download | rneovim-31f879983f5effb94a8d62c3073576511131bf6e.tar.gz rneovim-31f879983f5effb94a8d62c3073576511131bf6e.tar.bz2 rneovim-31f879983f5effb94a8d62c3073576511131bf6e.zip | |
third-party: use CXX only for BuildGperf (#10512)
This allows to build deps without g++ when not using the bundled gperf.
> make deps DEPS_CMAKE_FLAGS='-DUSE_BUNDLED_GPERF=0'
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildGperf.cmake | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 90570637ba..d550a550d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,7 +138,6 @@ addons: - clang-4.0 - cmake - cscope - - g++-multilib - gcc-multilib - gdb - gperf diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index a31033f92b..768c89f922 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -1,6 +1,6 @@ # This is not meant to be included by the top-level. cmake_minimum_required (VERSION 2.8.12) -project(NVIM_DEPS) +project(NVIM_DEPS C) # Needed for: check_c_compiler_flag() include(CheckCCompilerFlag) diff --git a/third-party/cmake/BuildGperf.cmake b/third-party/cmake/BuildGperf.cmake index 71c3cc1eef..e922f71ed5 100644 --- a/third-party/cmake/BuildGperf.cmake +++ b/third-party/cmake/BuildGperf.cmake @@ -2,6 +2,7 @@ # cross compiling we still want to build for the HOST system, whenever # writing a recipe that is meant for cross-compile, use the HOSTDEPS_* variables # instead of DEPS_* - check the main CMakeLists.txt for a list. +enable_language(CXX) # BuildGperf(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build Gperf, wraps ExternalProject_Add. |