llvm.org GIT mirror llvm / d36337c
[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 Don Hinton 4 months ago
1 changed file(s) with 5 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
554554 "PATH to binutils/include containing plugin-api.h for gold plugin.")
555555
556556 if(CMAKE_GENERATOR STREQUAL "Ninja")
557 include(CMakeNinjaFindMake OPTIONAL)
558 if(CMAKE_MAKE_PROGRAM)
559 execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} --version
560 OUTPUT_VARIABLE NINJA_VERSION
561 OUTPUT_STRIP_TRAILING_WHITESPACE)
562 set(NINJA_VERSION ${NINJA_VERSION} CACHE STRING "Ninja version number" FORCE)
563 message(STATUS "Ninja version: ${NINJA_VERSION}")
564 endif()
557 execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} --version
558 OUTPUT_VARIABLE NINJA_VERSION
559 OUTPUT_STRIP_TRAILING_WHITESPACE)
560 set(NINJA_VERSION ${NINJA_VERSION} CACHE STRING "Ninja version number" FORCE)
561 message(STATUS "Ninja version: ${NINJA_VERSION}")
565562 endif()
566563
567564 if(CMAKE_GENERATOR STREQUAL "Ninja" AND