diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-11-17 06:53:07 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-11-17 06:53:07 -0500 |
| commit | 3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb (patch) | |
| tree | 23a59f73d997f0a227e8eb3b0d7c66b8e7bed293 /CMakeLists.txt | |
| parent | cdf85dcc12bf227b5f4831b2b58c0b11f743aedf (diff) | |
| parent | 2b887ec66ba28f6d6fcbfdd121522fd7093bcc65 (diff) | |
| download | rneovim-3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb.tar.gz rneovim-3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb.tar.bz2 rneovim-3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb.zip | |
Merge pull request #1485 from equalsraf/tb-no-make-prg
Use cmake --build inside CMake scripts instead of calling Make directly
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9482e6d8a4..f7ecf10816 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,28 +205,6 @@ if(NOT BUSTED_OUTPUT_TYPE) set(BUSTED_OUTPUT_TYPE "utfTerminal") endif() -# Setup make. -find_program(MAKE_PRG NAMES gmake make) -if(MAKE_PRG) - execute_process( - COMMAND "${MAKE_PRG}" --version - OUTPUT_VARIABLE MAKE_VERSION_INFO) - if(NOT "${OUTPUT_VARIABLE}" MATCHES ".*GNU.*") - unset(MAKE_PRG) - endif() -endif() -if(NOT MAKE_PRG) - message(FATAL_ERROR "GNU Make is required to build the dependencies.") -else() - message(STATUS "Found GNU Make at ${MAKE_PRG}") -endif() - -# When using make, use the $(MAKE) variable to avoid warnings about the job -# server. -if(CMAKE_GENERATOR MATCHES "Makefiles") - set(MAKE_PRG "$(MAKE)") -endif() - # CMake is painful here. It will create the destination using the user's # current umask, and we don't want that. And we don't just want to install # the target directory, as it will mess with existing permissions. So this @@ -251,15 +229,6 @@ endforeach() install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/GenerateHelptags.cmake) -# Unfortunately, the below does not work under Ninja. Ninja doesn't use a -# pseudo-tty when launching processes, because it can put many jobs in parallel -# and eat-up all the available pseudo-ttys. Unfortunately, that doesn't work -# well with the legacy tests. I have a branch that converts them to run under -# CTest, but it needs a little more work. -# add_custom_target(test -# COMMAND ${MAKE_PRG} -C ${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/testdir -# VIMPROG=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/nvim) - # Go down the tree. add_subdirectory(src/nvim) |