[llvm] r361501 - [cmake] When getting Ninja version, don't include CMakeNinjaFindMake
Don Hinton via llvm-commits
llvm-commits at lists.llvm.org
Thu May 23 08:03:23 PDT 2019
Author: dhinton
Date: Thu May 23 08:03:22 2019
New Revision: 361501
URL: http://llvm.org/viewvc/llvm-project?rev=361501&view=rev
Log:
[cmake] When getting Ninja version, don't include CMakeNinjaFindMake
which doesn't play well with passing CMAKE_MAKE_PROGRAM from the
commandline without a path.
Fixes a bug introduced in r361280.
Thanks to Mikael Holmén for reporting this!
Modified:
llvm/trunk/cmake/config-ix.cmake
Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=361501&r1=361500&r2=361501&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Thu May 23 08:03:22 2019
@@ -555,14 +555,11 @@ set(LLVM_BINUTILS_INCDIR "" CACHE PATH
"PATH to binutils/include containing plugin-api.h for gold plugin.")
if(CMAKE_GENERATOR STREQUAL "Ninja")
- include(CMakeNinjaFindMake OPTIONAL)
- if(CMAKE_MAKE_PROGRAM)
- execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} --version
- OUTPUT_VARIABLE NINJA_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(NINJA_VERSION ${NINJA_VERSION} CACHE STRING "Ninja version number" FORCE)
- message(STATUS "Ninja version: ${NINJA_VERSION}")
- endif()
+ execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} --version
+ OUTPUT_VARIABLE NINJA_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(NINJA_VERSION ${NINJA_VERSION} CACHE STRING "Ninja version number" FORCE)
+ message(STATUS "Ninja version: ${NINJA_VERSION}")
endif()
if(CMAKE_GENERATOR STREQUAL "Ninja" AND
More information about the llvm-commits
mailing list