This is an archive of the discontinued LLVM Phabricator instance.

Differential D91959

[mlir] use STATUS instead of CHECK_* in MLIRDetectPythonEnv.cmake
ClosedPublic

Authored by ftynse on Nov 23 2020, 4:59 AM.

Download Raw Diff

Details

Reviewers

stellaraccident
mehdi_amini

Commits

rG21b346bd70ba: [mlir] use STATUS instead of CHECK_* in MLIRDetectPythonEnv.cmake

Summary

CHECK_* directives for message() where added in Cmake 3.17, LLVM
requires 3.14 as minimum so they may not be intepreted correctly and
just print "CHECK_*" into the message stream. Replace them with STATUS.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

ftynse created this revision.Nov 23 2020, 4:59 AM

Herald added a project: Restricted Project. · View Herald TranscriptNov 23 2020, 4:59 AM

Herald added subscribers: teijeong, rdzhabarov, tatianashp and 14 others. · View Herald Transcript

ftynse requested review of this revision.Nov 23 2020, 4:59 AM

Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald TranscriptNov 23 2020, 4:59 AM

Harbormaster completed remote builds in B79783: Diff 307049.Nov 23 2020, 5:20 AM

LGTM

stellaraccident accepted this revision.Nov 24 2020, 2:21 PM

This revision is now accepted and ready to land.Nov 24 2020, 2:21 PM

Closed by commit rG21b346bd70ba: [mlir] use STATUS instead of CHECK_* in MLIRDetectPythonEnv.cmake (authored by ftynse). · Explain WhyNov 24 2020, 3:09 PM

This revision was automatically updated to reflect the committed changes.

ftynse added a commit: rG21b346bd70ba: [mlir] use STATUS instead of CHECK_* in MLIRDetectPythonEnv.cmake.

Revision Contents

Path

Size

mlir/

cmake/

modules/

MLIRDetectPythonEnv.cmake

6 lines

Diff 307049

mlir/cmake/modules/MLIRDetectPythonEnv.cmake

	# Macros and functions related to detecting details of the Python environment.			# Macros and functions related to detecting details of the Python environment.

	# Detects a pybind11 package installed in the current python environment			# Detects a pybind11 package installed in the current python environment
	# and sets variables to allow it to be found. This allows pybind11 to be			# and sets variables to allow it to be found. This allows pybind11 to be
	# installed via pip, which typically yields a much more recent version than			# installed via pip, which typically yields a much more recent version than
	# the OS install, which will be available otherwise.			# the OS install, which will be available otherwise.
	function(mlir_detect_pybind11_install)			function(mlir_detect_pybind11_install)
	if(pybind11_DIR)			if(pybind11_DIR)
	message(STATUS "Using explicit pybind11 cmake directory: ${pybind11_DIR} (-Dpybind11_DIR to change)")			message(STATUS "Using explicit pybind11 cmake directory: ${pybind11_DIR} (-Dpybind11_DIR to change)")
	else()			else()
	message(CHECK_START "Checking for pybind11 in python path...")			message(STATUS "Checking for pybind11 in python path...")
	execute_process(			execute_process(
	COMMAND "${PYTHON_EXECUTABLE}"			COMMAND "${PYTHON_EXECUTABLE}"
	-c "import pybind11;print(pybind11.get_cmake_dir(), end='')"			-c "import pybind11;print(pybind11.get_cmake_dir(), end='')"
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	RESULT_VARIABLE STATUS			RESULT_VARIABLE STATUS
	OUTPUT_VARIABLE PACKAGE_DIR			OUTPUT_VARIABLE PACKAGE_DIR
	ERROR_QUIET)			ERROR_QUIET)
	if(NOT STATUS EQUAL "0")			if(NOT STATUS EQUAL "0")
	message(CHECK_FAIL "not found (install via 'pip install pybind11' or set pybind11_DIR)")			message(STATUS "not found (install via 'pip install pybind11' or set pybind11_DIR)")
	return()			return()
	endif()			endif()
	message(CHECK_PASS "found (${PACKAGE_DIR})")			message(STATUS "found (${PACKAGE_DIR})")
	set(pybind11_DIR "${PACKAGE_DIR}" PARENT_SCOPE)			set(pybind11_DIR "${PACKAGE_DIR}" PARENT_SCOPE)
	endif()			endif()
	endfunction()			endfunction()