From: Don Hinton <hintonda@gmail.com>
Date: Thu, 23 May 2019 15:03:22 +0000 (+0000)
Subject: [cmake] When getting Ninja version, don't include CMakeNinjaFindMake
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d36337c5f7c60a3d739c7bf1ea4b241a9fc2bafe;p=llvm

[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!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361501 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 36ec98a9386..e1e5cd3198b 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -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